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

Merge "Allow to customize title of the dialog." into mnc-dev

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2015-06-17 23:51:05 +00:00
committed by Android (Google) Code Review
parent 802ece6139 0e591f95bd
commit 9ce9ffec9e
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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_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_INFO = "info";
field public static final java.lang.String EXTRA_LOADING = "loading"; 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"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
} }

1
api/system-current.txt
View File

@@ -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_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_INFO = "info";
field public static final java.lang.String EXTRA_LOADING = "loading"; 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"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
} }

5
core/java/android/provider/DocumentsContract.java
View File

@@ -107,6 +107,11 @@ public final class DocumentsContract {
*/ */
public static final String EXTRA_ORIENTATION = "android.content.extra.ORIENTATION"; 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} */ /** {@hide} */
public static final String ACTION_MANAGE_ROOT = "android.provider.action.MANAGE_ROOT"; public static final String ACTION_MANAGE_ROOT = "android.provider.action.MANAGE_ROOT";
/** {@hide} */ /** {@hide} */

19
packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
View File

@@ -393,13 +393,18 @@ public class DocumentsActivity extends BaseActivity {
@Override @Override
public void updateActionBar() { public void updateActionBar() {
if (mRootsToolbar != null) { if (mRootsToolbar != null) {
if (mState.action == ACTION_OPEN || final String prompt = getIntent().getStringExtra(DocumentsContract.EXTRA_PROMPT);
mState.action == ACTION_GET_CONTENT || if (prompt != null) {
mState.action == ACTION_OPEN_TREE) { mRootsToolbar.setTitle(prompt);
mRootsToolbar.setTitle(R.string.title_open); } else {
} else if (mState.action == ACTION_CREATE || if (mState.action == ACTION_OPEN ||
mState.action == ACTION_OPEN_COPY_DESTINATION) { mState.action == ACTION_GET_CONTENT ||
mRootsToolbar.setTitle(R.string.title_save); 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);
}
} }
} }