Merge "Add support for dpads." into nyc-dev

2016-03-16 20:24:07 +00:00
parent 140b2ac6db 57c8ab9c9b
commit 7f245435c5
1 changed files with 8 additions and 5 deletions
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -1263,12 +1263,15 @@ public class DirectoryFragment extends Fragment
            }

            // Handle enter key events
-            if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                if (event.isShiftPressed()) {
-                    return onSelect(doc);
-                } else {
+            switch (keyCode) {
+                case KeyEvent.KEYCODE_ENTER:
+                    if (event.isShiftPressed()) {
+                        return onSelect(doc);
+                    }
+                    // For non-shifted enter keypresses, fall through.
+                case KeyEvent.KEYCODE_DPAD_CENTER:
+                case KeyEvent.KEYCODE_BUTTON_A:
                    return onActivate(doc);
-                }
            }

            return false;