Dynamically enable spatial navigation based on events

android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.graphics.Rect;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ skipping 20 matching lines @@
             View containerView) {
         mContentsClient = contentsClient;
         mContainerView = containerView;
     }
 
     @Override
     public void onLoadProgressChanged(int progress) {
         mContentsClient.onProgressChanged(progress);
     }
 
+    // Converts a KeyEvent into the corresponding View.FOCUS_XXX integer type, iff the key
+    // event is a key down action, and is a DPAD_XXX key code.
+    static int getViewDirectionFromKeyEvent(KeyEvent event) {

[dmazzoni, 2013/10/22 06:47:55]

Would it be too verbose to say getViewFocusDirectionFromDpadKeyEvent?

[joth, 2013/10/22 22:02:41]

Good suggestion, however in the end I reverted this file due to this switch not
including DPAD_CENTER key

+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            switch (event.getKeyCode()) {
+                case KeyEvent.KEYCODE_DPAD_DOWN:
+                    return View.FOCUS_DOWN;
+                case KeyEvent.KEYCODE_DPAD_UP:
+                    return View.FOCUS_UP;
+                case KeyEvent.KEYCODE_DPAD_LEFT:
+                    return View.FOCUS_LEFT;
+                case KeyEvent.KEYCODE_DPAD_RIGHT:
+                    return View.FOCUS_RIGHT;
+            }
+        }
+        return 0;

[sgurun-gerrit only, 2013/10/22 17:18:00]

0 is a special number, i.e. View.FOCUSABLES_ALL, but I guess it is not very
important here.

[joth, 2013/10/22 22:02:41]

FOCUSABLES_ALL is used with  addFocusables(), these constants are the ones for
passing to focusSearch(int) for which 0 is invalid value
(but again, this file now reverted)

+    }
+
     @Override
     public void handleKeyboardEvent(KeyEvent event) {
-        if (event.getAction() == KeyEvent.ACTION_DOWN) {
-            int direction;
-            switch (event.getKeyCode()) {
-                case KeyEvent.KEYCODE_DPAD_DOWN:
-                    direction = View.FOCUS_DOWN;
-                    break;
-                case KeyEvent.KEYCODE_DPAD_UP:
-                    direction = View.FOCUS_UP;
-                    break;
-                case KeyEvent.KEYCODE_DPAD_LEFT:
-                    direction = View.FOCUS_LEFT;
-                    break;
-                case KeyEvent.KEYCODE_DPAD_RIGHT:
-                    direction = View.FOCUS_RIGHT;
-                    break;
-                default:
-                    direction = 0;
-                    break;
-            }
-            if (direction != 0 && tryToMoveFocus(direction)) return;
-        }
+        int direction = getViewDirectionFromKeyEvent(event);
+        if (direction != 0 && tryToMoveFocus(direction)) return;
+
         mContentsClient.onUnhandledKeyEvent(event);
     }
 
     @Override
     public boolean takeFocus(boolean reverse) {
         int direction =
             (reverse == (mContainerView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL)) ?
             View.FOCUS_RIGHT : View.FOCUS_LEFT;
         if (tryToMoveFocus(direction)) return true;
         direction = reverse ? View.FOCUS_UP : View.FOCUS_DOWN;
@@ skipping 107 matching lines @@
     @Override
     public boolean addNewContents(boolean isDialog, boolean isUserGesture) {
         return mContentsClient.onCreateWindow(isDialog, isUserGesture);
     }
 
     @Override
     public void activateContents() {
         mContentsClient.onRequestFocus();
     }
 }