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

2016-03-16 20:05:47 +00:00
parent 83d0078f95 88edde4d33
commit 08e5936485
1 changed files with 2 additions and 1 deletions
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
@@ -104,7 +104,8 @@ public abstract class FragmentTuner {
                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.