diff options
author | Michael Kolb <kolby@google.com> | 2011-07-20 13:52:25 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2011-07-20 13:52:29 -0700 |
commit | 3ca12750f9b6231b00a1856dcb25c2d2e07e8784 (patch) | |
tree | 155cd2b6c7fa60385863427147a1e9a7d6472cb4 /src/com/android/browser/NavigationBarPhone.java | |
parent | 3b02d34b1f3c6c1629f23b9ffcb372fbf2f1d880 (diff) | |
download | packages_apps_browser-3ca12750f9b6231b00a1856dcb25c2d2e07e8784.zip packages_apps_browser-3ca12750f9b6231b00a1856dcb25c2d2e07e8784.tar.gz packages_apps_browser-3ca12750f9b6231b00a1856dcb25c2d2e07e8784.tar.bz2 |
use system menu
On phones with hardware menu key, use the framework's
menu
Also fixes:
Bug: 5051899
remove overflow button from bar if menu key is present
Nav options are not visible on tab switcher
Change-Id: I5b55934a392a76f9d9ef16e3bf5c71f27b88d69a
Diffstat (limited to 'src/com/android/browser/NavigationBarPhone.java')
-rw-r--r-- | src/com/android/browser/NavigationBarPhone.java | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java index 2030169..400b695 100644 --- a/src/com/android/browser/NavigationBarPhone.java +++ b/src/com/android/browser/NavigationBarPhone.java @@ -167,30 +167,6 @@ public class NavigationBarPhone extends NavigationBarBase implements return mMenuShowing; } - void showMenu() { - // called from menu key, use tab switcher as anchor - mMenuShowing = true; - if (isEditingUrl()) { - stopEditingUrl(); - post(new Runnable() { - @Override - public void run() { - showMenu(); - } - }); - } else { - mBaseUi.getTitleBar().setSkipTitleBarAnimations(true); - mBaseUi.showTitleBar(); - mBaseUi.getTitleBar().setSkipTitleBarAnimations(false); - post(new Runnable() { - @Override - public void run() { - showMenu(mTabSwitcher); - } - }); - } - } - void showMenu(View anchor) { mMenuShowing = true; mPopupMenu = new PopupMenu(mContext, anchor); @@ -202,13 +178,6 @@ public class NavigationBarPhone extends NavigationBarBase implements mPopupMenu.show(); } - void dismissMenu() { - if (mPopupMenu != null) { - mPopupMenu.dismiss(); - mBaseUi.suggestHideTitleBar(); - } - } - @Override public void onDismiss(PopupMenu menu) { onMenuHidden(); |