commit fb812e56f41c1b1f0f28773b01b60e1ec0c242a6
author Michael Kolb <kolby@google.com> Mon Mar 21 18:17:54 2011 -0700
committer Michael Kolb <kolby@google.com> Mon Mar 21 18:19:12 2011 -0700
tree 5c3157362070bf0743ee43c7e6b8bff5bdf32f01
parent 2ba24b9e37f6b88533d9af849102d97173c6324d

fix shortcut handling

    Bug: 4142120
    Removed canChord flag which prevented keyboard shortcuts
    from working
    Also removed escape shortcut

Change-Id: I0bd5f9079a54896dd4cbcea3461013e48a3d1021

src/com/android/browser/Controller.java

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 @@
     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 @@
         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 @@
             // 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 @@
             case R.id.share_page_menu_id:
                 Tab currentTab = mTabControl.getCurrentTab();
                 if (null == currentTab) {
-                    mCanChord = false;
                     return false;
                 }
                 shareCurrentPage(currentTab);
@@ -1706,7 +1694,6 @@
             default:
                 return false;
         }
-        mCanChord = false;
         return true;
     }
 
@@ -1716,9 +1703,6 @@
             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 @@
                 // For other context menus
                 result = onOptionsItemSelected(item);
         }
-        mCanChord = false;
         return result;
     }
 
@@ -2514,10 +2497,6 @@
                     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