From e0e36df29484bf6b0b34fb958701ed7ddd96a40a Mon Sep 17 00:00:00 2001
From: Ben Kwa <kenobi@google.com>
Date: Wed, 10 Feb 2016 08:57:25 -0800
Subject: [PATCH] Handle shift-enter key events.

Shift-enter toggles selection on the focused item.

BUG=25196158

Change-Id: I261c249cdf1856d134910a4767b0daf8963d5b68
---
 .../com/android/documentsui/dirlist/DirectoryFragment.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 726538e34402e..2fae24a16c56e 100644
--- 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;