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

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 27d770b46afc..6d63c6fe901b 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3793,6 +3793,13 @@ public final class ViewRootImpl implements ViewParent,
                         finishInputEvent(q, true);
                         return;
                     }
+                } 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;
+                    }
                 }
             }
         }