am fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."

# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit 'fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
  Fix ViewRootImpl to find missing focus using D-pad.

diff --cc core/java/android/view/ViewRootImpl.java
index 58e6fbe,6d63c6f..f2e49c9
--- 1/core/java/android/view/ViewRootImpl.java
--- 2/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@@ -3749,8 -3790,16 +3749,15 @@@ public final class ViewRootImpl impleme
  
                      // Give the focused view a last chance to handle the dpad key.
                      if (mView.dispatchUnhandledMove(focused, direction)) {
 -                        finishInputEvent(q, true);
 -                        return;
 +                        return EVENT_HANDLED;
                      }
+                 } else {
+                     // find the best view to give focus to in this non-touch-mode with no-focus
+                     View v = focusSearch(null, direction);
+                     if (v != null && v.requestFocus(direction)) {
+                         finishInputEvent(q, true);
+                         return;
+                     }
                  }
              }
          }