diff options
author | Michael Kolb <kolby@google.com> | 2011-03-21 18:32:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 18:32:13 -0700 |
commit | 8835aed78de8fbe6a76df5b15a6c4ebf7852e337 (patch) | |
tree | 5c3157362070bf0743ee43c7e6b8bff5bdf32f01 | |
parent | 6eff16185dff1cadfffef88440085f6181fa0ed7 (diff) | |
parent | fb812e56f41c1b1f0f28773b01b60e1ec0c242a6 (diff) | |
download | packages_apps_Browser-8835aed78de8fbe6a76df5b15a6c4ebf7852e337.zip packages_apps_Browser-8835aed78de8fbe6a76df5b15a6c4ebf7852e337.tar.gz packages_apps_Browser-8835aed78de8fbe6a76df5b15a6c4ebf7852e337.tar.bz2 |
am fb812e56: fix shortcut handling
* commit 'fb812e56f41c1b1f0f28773b01b60e1ec0c242a6':
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 36c519a..a028882 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 @@ -1425,9 +1422,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. @@ -1506,11 +1500,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; } @@ -1654,7 +1643,6 @@ public class Controller case R.id.share_page_menu_id: Tab currentTab = mTabControl.getCurrentTab(); if (null == currentTab) { - mCanChord = false; return false; } shareCurrentPage(currentTab); @@ -1706,7 +1694,6 @@ public class Controller default: return false; } - mCanChord = false; return true; } @@ -1716,9 +1703,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) { @@ -1757,7 +1741,6 @@ public class Controller // For other context menus result = onOptionsItemSelected(item); } - mCanChord = false; return result; } @@ -2514,10 +2497,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 |