Merge "Handle shift-enter key events." into nyc-dev

2016-02-11 21:07:11 +00:00
parent 22b598bb82 09eb77be9a
commit 844674f99f
1 changed files with 5 additions and 2 deletions
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -101,7 +101,6 @@ import com.android.documentsui.model.RootInfo;
 import com.android.documentsui.services.FileOperationService;
 import com.android.documentsui.services.FileOperationService.OpType;
 import com.android.documentsui.services.FileOperations;
-
 import com.google.common.collect.Lists;

 import java.lang.annotation.Retention;
@@ -1267,7 +1266,11 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi

            // Handle enter key events
            if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                return onActivate(doc);
+                if (event.isShiftPressed()) {
+                    return onSelect(doc);
+                } else {
+                    return onActivate(doc);
+                }
            }

            return false;