diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-04-13 05:18:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-13 05:18:52 +0000 |
| commit | 834a91dda7724974fbd93bc65b9dd7178edddcdd (patch) | |
| tree | 303096cf487f44b35853295608826f0eeb3f20c8 /core/java | |
| parent | 0a9bce976ae6f46cbd0e75cc857480c4d117acad (diff) | |
| parent | 1407d4c77732c7fad34c6b813d05771de6ed970f (diff) | |
Merge "DocumentsUI roots can have settings."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/DocumentsContract.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index b0a600bd98dc..69338b0655f6 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -107,7 +107,12 @@ public final class DocumentsContract { public static final String ACTION_MANAGE_DOCUMENT = "android.provider.action.MANAGE_DOCUMENT"; /** {@hide} */ - public static final String ACTION_BROWSE_ROOT = "android.provider.action.BROWSE_ROOT"; + public static final String + ACTION_BROWSE_DOCUMENT_ROOT = "android.provider.action.BROWSE_DOCUMENT_ROOT"; + + /** {@hide} */ + public static final String + ACTION_DOCUMENT_ROOT_SETTINGS = "android.provider.action.DOCUMENT_ROOT_SETTINGS"; /** * Buffer is large enough to rewind past any EXIF headers. @@ -476,6 +481,15 @@ public final class DocumentsContract { * @hide */ public static final int FLAG_ADVANCED = 1 << 17; + + /** + * Flag indicating that this root has settings. + * + * @see #COLUMN_FLAGS + * @see DocumentsContract#ACTION_DOCUMENT_ROOT_SETTINGS + * @hide + */ + public static final int FLAG_HAS_SETTINGS = 1 << 18; } /** |