Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Block directory selection in openable modes." into mnc-dr-dev

Browse Source 
am: 00765ef5a2

* commit '00765ef5a2a0981d18a15f3acaf4119592d42996':
  Block directory selection in openable modes.
This commit is contained in:
Jeff Sharkey
2015-11-09 21:46:06 +00:00
committed by android-build-merger
parent 02bf433f90 00765ef5a2
commit e6538dcc06
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
View File

@@ -19,7 +19,10 @@ package com.android.documentsui;
import static com.android.documentsui.BaseActivity.State.ACTION_BROWSE; import static com.android.documentsui.BaseActivity.State.ACTION_BROWSE;
import static com.android.documentsui.BaseActivity.State.ACTION_BROWSE_ALL; import static com.android.documentsui.BaseActivity.State.ACTION_BROWSE_ALL;
import static com.android.documentsui.BaseActivity.State.ACTION_CREATE; import static com.android.documentsui.BaseActivity.State.ACTION_CREATE;
import static com.android.documentsui.BaseActivity.State.ACTION_GET_CONTENT;
import static com.android.documentsui.BaseActivity.State.ACTION_MANAGE; import static com.android.documentsui.BaseActivity.State.ACTION_MANAGE;
import static com.android.documentsui.BaseActivity.State.ACTION_OPEN;
import static com.android.documentsui.BaseActivity.State.ACTION_OPEN_TREE;
import static com.android.documentsui.BaseActivity.State.MODE_GRID; import static com.android.documentsui.BaseActivity.State.MODE_GRID;
import static com.android.documentsui.BaseActivity.State.MODE_LIST; import static com.android.documentsui.BaseActivity.State.MODE_LIST;
import static com.android.documentsui.BaseActivity.State.MODE_UNKNOWN; import static com.android.documentsui.BaseActivity.State.MODE_UNKNOWN;
@@ -578,11 +581,23 @@ public class DirectoryFragment extends Fragment {
// Directories and footer items cannot be checked // Directories and footer items cannot be checked
boolean valid = false; boolean valid = false;
final State state = getDisplayState(DirectoryFragment.this);
final Cursor cursor = mAdapter.getItem(position); final Cursor cursor = mAdapter.getItem(position);
if (cursor != null) { if (cursor != null) {
final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE); final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS); final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
switch (state.action) {
case ACTION_OPEN:
case ACTION_CREATE:
case ACTION_GET_CONTENT:
case ACTION_OPEN_TREE:
valid = isDocumentEnabled(docMimeType, docFlags)
&& !Document.MIME_TYPE_DIR.equals(docMimeType);
break;
default:
valid = isDocumentEnabled(docMimeType, docFlags); valid = isDocumentEnabled(docMimeType, docFlags);
break;
}
} }
if (!valid) { if (!valid) {