diff options
| author | John Reck <jreck@google.com> | 2011-08-11 17:36:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-11 17:36:41 -0700 |
| commit | 4da81c8ec8fa457f091c709ff0986353f7ffe08f (patch) | |
| tree | 6ad42e6708ccc33ffb14b0bf26191e75df89d0bf /src/com | |
| parent | 3844ef8ce0908597ea5b472a817b4e22bf22d4e9 (diff) | |
| parent | eac25cd7ae17cd626fe55060dcd0a003e6171ad7 (diff) | |
| download | packages_apps_Browser-4da81c8ec8fa457f091c709ff0986353f7ffe08f.tar.gz packages_apps_Browser-4da81c8ec8fa457f091c709ff0986353f7ffe08f.tar.bz2 packages_apps_Browser-4da81c8ec8fa457f091c709ff0986353f7ffe08f.zip | |
Merge "Menu shuffling"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/Controller.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/NavigationBarBase.java | 5 | ||||
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 7c93e9f62..cafbafbf1 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1518,8 +1518,6 @@ public class Controller counter.setVisible(showDebugSettings); counter.setEnabled(showDebugSettings); - MenuItem saveSnapshot = menu.findItem(R.id.save_snapshot_menu_id); - saveSnapshot.setVisible(tab != null && !tab.isSnapshot()); mUi.updateMenuState(tab, menu); } diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java index e6eed1864..aa8b79f2a 100644 --- a/src/com/android/browser/NavigationBarBase.java +++ b/src/com/android/browser/NavigationBarBase.java @@ -121,6 +121,11 @@ public class NavigationBarBase extends LinearLayout implements OnClickListener, popup.getMenuInflater().inflate(R.menu.ua_switcher, menu); menu.findItem(R.id.ua_mobile_menu_id).setChecked(!desktop); menu.findItem(R.id.ua_desktop_menu_id).setChecked(desktop); + Tab tab = mUiController.getCurrentTab(); + MenuItem saveSnapshot = menu.findItem(R.id.save_snapshot_menu_id); + saveSnapshot.setVisible(tab != null && !tab.isSnapshot()); + MenuItem find = menu.findItem(R.id.find_menu_id); + find.setVisible(tab != null && !tab.isSnapshot()); popup.setOnMenuItemClickListener(this); popup.show(); } diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index f33dbef6d..7321267cd 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -180,10 +180,6 @@ public class PhoneUi extends BaseUi { if (nt != null) { nt.setVisible(mNavScreen == null); } - MenuItem find = menu.findItem(R.id.find_menu_id); - if (find != null) { - find.setVisible(((tab != null) && !tab.isSnapshot())); - } MenuItem abm = menu.findItem(R.id.add_bookmark_menu_id); if (abm != null) { abm.setVisible((tab != null) && !tab.isSnapshot()); |