commit da0fe556a00773ce2af25eb6dcc5442bd08c7add
author Grace Kloba <klobag@google.com> Tue Sep 22 18:17:24 2009 -0700
committer Grace Kloba <klobag@google.com> Wed Sep 23 09:45:20 2009 -0700
tree 1cb1678841bb18fd08c41dd142b7163e8aca1488
parent a5bf1deca120315a2643ea5b010f94d853461b15

Move the page up/down shortcut key from onKeyUp to onKeyDown as
WebView handles the keys in down, not up.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index b6f1e86..faf0e6b 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -2147,8 +2147,14 @@
                 mMenuIsDown = true;
                 break;
             case KeyEvent.KEYCODE_SPACE:
-                // Browser's hidden shortcut key. Don't call super so that
-                // search won't be triggered.
+                // WebView/WebTextView handle the keys in the KeyDown. As
+                // the Activity's shortcut keys are only handled when WebView
+                // doesn't, have to do it in onKeyDown instead of onKeyUp.
+                if (event.isShiftPressed()) {
+                    getTopWindow().pageUp(false);
+                } else {
+                    getTopWindow().pageDown(false);
+                }
                 return true;
             case KeyEvent.KEYCODE_BACK:
                 if (event.getRepeatCount() == 0) {
@@ -2170,13 +2176,6 @@
             case KeyEvent.KEYCODE_MENU:
                 mMenuIsDown = false;
                 break;
-            case KeyEvent.KEYCODE_SPACE:
-                if (event.isShiftPressed()) {
-                    getTopWindow().pageUp(false);
-                } else {
-                    getTopWindow().pageDown(false);
-                }
-                return true;
             case KeyEvent.KEYCODE_BACK:
                 if (event.isTracking() && !event.isCanceled()) {
                     if (mCustomView != null) {