summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/DocumentsContract.java
diff options
context:
space:
mode:
authorTomasz Mikolajewski <mtomasz@google.com>2015-06-18 00:02:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-18 00:02:57 +0000
commit456778ffaf6e360a7e4fa372500685ca8b202232 (patch)
tree695090aed5572d6c38f8f201962735805e0dbdc8 /core/java/android/provider/DocumentsContract.java
parent82422c313e5efc80c917afdcf532d6616fbc2313 (diff)
parent9ce9ffec9e307e29c3d575854d4e357ecf06d2d8 (diff)
downloadframeworks_base-456778ffaf6e360a7e4fa372500685ca8b202232.zip
frameworks_base-456778ffaf6e360a7e4fa372500685ca8b202232.tar.gz
frameworks_base-456778ffaf6e360a7e4fa372500685ca8b202232.tar.bz2
am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev
* commit '9ce9ffec9e307e29c3d575854d4e357ecf06d2d8': Allow to customize title of the dialog.
Diffstat (limited to 'core/java/android/provider/DocumentsContract.java')
-rw-r--r--core/java/android/provider/DocumentsContract.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index 30535ff..c7ba607 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -107,6 +107,11 @@ public final class DocumentsContract {
*/
public static final String EXTRA_ORIENTATION = "android.content.extra.ORIENTATION";
+ /**
+ * Overrides the default prompt text in DocumentsUI when set in an intent.
+ */
+ public static final String EXTRA_PROMPT = "android.provider.extra.PROMPT";
+
/** {@hide} */
public static final String ACTION_MANAGE_ROOT = "android.provider.action.MANAGE_ROOT";
/** {@hide} */