commit 08e5936485a830ee80c4bf42a8402e1d13a783f9
author Steve McKay <smckay@google.com> Wed Mar 16 20:05:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 16 20:05:48 2016 +0000
tree fb6e3488c8a2ae48dc6d703a04a30e5381c83791
parent 83d0078f9571b3967ba73ca3651c60d55cd4096c
parent 88edde4d33861afe925b246c9175e6d5025eb912

Merge "Don't allow selection in copy dest picker." into nyc-dev

packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java

diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
index 39fdf8e..ea1deb4 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
@@ -104,7 +104,8 @@
                 return false;
             }
 
-            if (mState.action == ACTION_OPEN_TREE) {
+            if (mState.action == ACTION_OPEN_TREE
+                    || mState.action == ACTION_PICK_COPY_DESTINATION) {
                 // In this case nothing *ever* is selectable...the expected user behavior is
                 // they navigate *into* a folder, then click a confirmation button indicating
                 // that the current directory is the directory they are picking.