diff options
author | Michael Kolb <kolby@google.com> | 2011-03-22 11:42:44 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 11:42:44 -0700 |
commit | 71791a09579b21ef61f00c38056497cd99667440 (patch) | |
tree | c48562b6dd42628e1f15ee2ca636e0007453e9c1 | |
parent | 88a42b73f517d758fea872c01bbf456c602a3073 (diff) | |
parent | 8835aed78de8fbe6a76df5b15a6c4ebf7852e337 (diff) | |
download | packages_apps_Browser-71791a09579b21ef61f00c38056497cd99667440.zip packages_apps_Browser-71791a09579b21ef61f00c38056497cd99667440.tar.gz packages_apps_Browser-71791a09579b21ef61f00c38056497cd99667440.tar.bz2 |
am 8835aed7: am fb812e56: fix shortcut handling
* commit '8835aed78de8fbe6a76df5b15a6c4ebf7852e337':
fix shortcut handling
-rw-r--r-- | src/com/android/browser/Controller.java | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 4f24a24..efc58b1 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -161,9 +161,6 @@ public class Controller private int mOldMenuState = EMPTY_MENU; private Menu mCachedMenu; - // Used to prevent chording to result in firing two shortcuts immediately - // one after another. Fixes bug 1211714. - boolean mCanChord; private boolean mMenuIsDown; // For select and find, we keep track of the ActionMode so that @@ -1431,9 +1428,6 @@ public class Controller if (mOptionsMenuHandler != null) { return mOptionsMenuHandler.onPrepareOptionsMenu(menu); } - // This happens when the user begins to hold down the menu key, so - // allow them to chord to get a shortcut. - mCanChord = true; // Note: setVisible will decide whether an item is visible; while // setEnabled() will decide whether an item is enabled, which also means // whether the matching shortcut key will function. @@ -1512,11 +1506,6 @@ public class Controller // if main menu option is selected removeComboView(); } - if (!mCanChord) { - // The user has already fired a shortcut with this hold down of the - // menu key. - return false; - } if (null == getCurrentTopWebView()) { return false; } @@ -1660,7 +1649,6 @@ public class Controller case R.id.share_page_menu_id: Tab currentTab = mTabControl.getCurrentTab(); if (null == currentTab) { - mCanChord = false; return false; } shareCurrentPage(currentTab); @@ -1712,7 +1700,6 @@ public class Controller default: return false; } - mCanChord = false; return true; } @@ -1722,9 +1709,6 @@ public class Controller return false; } - // chording is not an issue with context menus, but we use the same - // options selector, so set mCanChord to true so we can access them. - mCanChord = true; int id = item.getItemId(); boolean result = true; switch (id) { @@ -1763,7 +1747,6 @@ public class Controller // For other context menus result = onOptionsItemSelected(item); } - mCanChord = false; return result; } @@ -2519,10 +2502,6 @@ public class Controller return true; } break; - case KeyEvent.KEYCODE_ESCAPE: - if (!noModifiers) break; - stopLoading(); - return true; case KeyEvent.KEYCODE_SPACE: // WebView/WebTextView handle the keys in the KeyDown. As // the Activity's shortcut keys are only handled when WebView |