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/Controller.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/Controller.java')
| -rw-r--r-- | src/com/android/browser/Controller.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 9b81870..8a4433e 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1512,6 +1512,10 @@ public class Controller // won't get onKeyUp for MENU. So it is important to reset it here. mMenuIsDown = false; } + if (mUi.onOptionsItemSelected(item)) { + // ui callback handled it + return true; + } switch (item.getItemId()) { // -- Main menu case R.id.new_tab_menu_id: @@ -2462,10 +2466,6 @@ public class Controller boolean noModifiers = event.hasNoModifiers(); // Even if MENU is already held down, we need to call to super to open // the IME on long press. - if (KeyEvent.KEYCODE_MENU == keyCode) { - event.startTracking(); - return true; - } if (!noModifiers && ((KeyEvent.KEYCODE_MENU == keyCode) || (KeyEvent.KEYCODE_CTRL_LEFT == keyCode) |