Bug 932208 - Part 1: Remove Share from url bar context menu on pre-ICS. r=mfinkle

This commit is contained in:
Michael Comella 2014-06-09 09:58:27 -07:00
parent 7c15f50167
commit 3e78485b6e
3 changed files with 0 additions and 13 deletions

View File

@ -763,11 +763,6 @@ abstract public class BrowserApp extends GeckoApp
return true;
}
if (itemId == R.id.share) {
shareCurrentUrl();
return true;
}
if (itemId == R.id.subscribe) {
Tab tab = Tabs.getInstance().getSelectedTab();
if (tab != null && tab.hasFeeds()) {

View File

@ -11,9 +11,6 @@
<item android:id="@+id/paste"
android:title="@string/contextmenu_paste"/>
<item android:id="@+id/share"
android:title="@string/contextmenu_share"/>
<item android:id="@+id/subscribe"
android:title="@string/contextmenu_subscribe"/>

View File

@ -15,7 +15,6 @@ import org.mozilla.gecko.BrowserApp;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoApplication;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.LightweightTheme;
import org.mozilla.gecko.R;
import org.mozilla.gecko.Tab;
@ -335,7 +334,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
if (url == null) {
menu.findItem(R.id.copyurl).setVisible(false);
menu.findItem(R.id.add_to_launcher).setVisible(false);
MenuUtils.safeSetVisible(menu, R.id.share, false);
}
MenuUtils.safeSetVisible(menu, R.id.subscribe, tab.hasFeeds());
@ -344,12 +342,9 @@ public class BrowserToolbar extends ThemedRelativeLayout
// if there is no tab, remove anything tab dependent
menu.findItem(R.id.copyurl).setVisible(false);
menu.findItem(R.id.add_to_launcher).setVisible(false);
MenuUtils.safeSetVisible(menu, R.id.share, false);
MenuUtils.safeSetVisible(menu, R.id.subscribe, false);
MenuUtils.safeSetVisible(menu, R.id.add_search_engine, false);
}
MenuUtils.safeSetVisible(menu, R.id.share, !GeckoProfile.get(getContext()).inGuestMode());
}
});