summaryrefslogtreecommitdiffstats
path: root/packages/DocumentsUI
diff options
context:
space:
mode:
authorSteve McKay <smckay@google.com>2015-05-21 20:38:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-21 20:38:57 +0000
commit08226358a157b34ab7afb705e54538bf099f3316 (patch)
tree763bc7a0e863c4a842caf583588aff6a69f437e1 /packages/DocumentsUI
parent529f09251bc94049c9b2765466e27a914369be84 (diff)
parent4f95badec267c53f76475869b17f6bbccc66d406 (diff)
downloadframeworks_base-08226358a157b34ab7afb705e54538bf099f3316.zip
frameworks_base-08226358a157b34ab7afb705e54538bf099f3316.tar.gz
frameworks_base-08226358a157b34ab7afb705e54538bf099f3316.tar.bz2
am 4f95bade: Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev
* commit '4f95badec267c53f76475869b17f6bbccc66d406': [mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!
Diffstat (limited to 'packages/DocumentsUI')
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index 8482438..da59d0e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -466,7 +466,9 @@ public class DocumentsActivity extends BaseActivity {
boolean fileSizeVisible = !(mState.action == ACTION_MANAGE
|| mState.action == ACTION_BROWSE);
- if (mState.action == ACTION_CREATE || mState.action == ACTION_OPEN_TREE) {
+ if (mState.action == ACTION_CREATE
+ || mState.action == ACTION_OPEN_TREE
+ || mState.action == ACTION_OPEN_COPY_DESTINATION) {
createDir.setVisible(cwd != null && cwd.isCreateSupported());
mSearchManager.showMenu(false);