wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Comella 2014-06-09 09:58:27 -07:00
parent 2540cb7a79
commit ef48d6a330
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/base/BrowserApp.java
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()) {

3
mobile/android/base/resources/menu/titlebar_contextmenu.xml
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"/>

5
mobile/android/base/toolbar/BrowserToolbar.java
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());
}
});