diff options
| author | Tomasz Mikolajewski <mtomasz@google.com> | 2015-06-18 00:02:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-18 00:02:57 +0000 |
| commit | 456778ffaf6e360a7e4fa372500685ca8b202232 (patch) | |
| tree | 695090aed5572d6c38f8f201962735805e0dbdc8 | |
| parent | 82422c313e5efc80c917afdcf532d6616fbc2313 (diff) | |
| parent | 9ce9ffec9e307e29c3d575854d4e357ecf06d2d8 (diff) | |
| download | frameworks_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.
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/DocumentsContract.java | 5 | ||||
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java | 19 |
4 files changed, 19 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index 28791c4..7c22e4e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26061,6 +26061,7 @@ package android.provider { field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF"; field public static final java.lang.String EXTRA_INFO = "info"; field public static final java.lang.String EXTRA_LOADING = "loading"; + field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER"; } diff --git a/api/system-current.txt b/api/system-current.txt index 2dec0c8..67d3635 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28005,6 +28005,7 @@ package android.provider { field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF"; field public static final java.lang.String EXTRA_INFO = "info"; field public static final java.lang.String EXTRA_LOADING = "loading"; + field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER"; } 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} */ diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 90ccf91..4211406 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -393,13 +393,18 @@ public class DocumentsActivity extends BaseActivity { @Override public void updateActionBar() { if (mRootsToolbar != null) { - if (mState.action == ACTION_OPEN || - mState.action == ACTION_GET_CONTENT || - mState.action == ACTION_OPEN_TREE) { - mRootsToolbar.setTitle(R.string.title_open); - } else if (mState.action == ACTION_CREATE || - mState.action == ACTION_OPEN_COPY_DESTINATION) { - mRootsToolbar.setTitle(R.string.title_save); + final String prompt = getIntent().getStringExtra(DocumentsContract.EXTRA_PROMPT); + if (prompt != null) { + mRootsToolbar.setTitle(prompt); + } else { + if (mState.action == ACTION_OPEN || + mState.action == ACTION_GET_CONTENT || + mState.action == ACTION_OPEN_TREE) { + mRootsToolbar.setTitle(R.string.title_open); + } else if (mState.action == ACTION_CREATE || + mState.action == ACTION_OPEN_COPY_DESTINATION) { + mRootsToolbar.setTitle(R.string.title_save); + } } } |