summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steve McKay <smckay@google.com> 2016-03-16 20:05:47 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-16 20:05:48 +0000
commit08e5936485a830ee80c4bf42a8402e1d13a783f9 (patch)
treefb6e3488c8a2ae48dc6d703a04a30e5381c83791
parent83d0078f9571b3967ba73ca3651c60d55cd4096c (diff)
parent88edde4d33861afe925b246c9175e6d5025eb912 (diff)
Merge "Don't allow selection in copy dest picker." into nyc-dev
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
index 39fdf8e61765..ea1deb4cdcdb 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 @@ 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.