summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-09-26 19:42:52 -0700
committerJeff Sharkey <jsharkey@android.com>2013-09-26 19:42:52 -0700
commit3d52dc9c3a2fd9997322ce5e28607b3f7e9bfcf7 (patch)
tree18c4feabc6ed5998f46664cf7e0b8f689f43c4ef
parentee2f7df9ee8a4f43c3b0858bad08a4f0a59a627f (diff)
downloadframeworks_base-3d52dc9c3a2fd9997322ce5e28607b3f7e9bfcf7.zip
frameworks_base-3d52dc9c3a2fd9997322ce5e28607b3f7e9bfcf7.tar.gz
frameworks_base-3d52dc9c3a2fd9997322ce5e28607b3f7e9bfcf7.tar.bz2
Make directories always enabled, for realz.
Bug: 10946731 Change-Id: I3eb132c53e47f31d1d1723ed2262823b54b1fce0
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index 138f523..c46dfb2 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -1060,16 +1060,16 @@ public class DirectoryFragment extends Fragment {
private boolean isDocumentEnabled(String docMimeType, int docFlags) {
final State state = getDisplayState(DirectoryFragment.this);
- // Read-only files are disabled when creating
- if (state.action == ACTION_CREATE && (docFlags & Document.FLAG_SUPPORTS_WRITE) == 0) {
- return false;
- }
-
// Directories are always enabled
if (Document.MIME_TYPE_DIR.equals(docMimeType)) {
return true;
}
+ // Read-only files are disabled when creating
+ if (state.action == ACTION_CREATE && (docFlags & Document.FLAG_SUPPORTS_WRITE) == 0) {
+ return false;
+ }
+
return MimePredicate.mimeMatches(state.acceptMimes, docMimeType);
}
}