Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 456778ff authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android Git Automerger
Browse files

am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev 

* commit '9ce9ffec':
  Allow to customize title of the dialog.
parents 82422c31 9ce9ffec

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

  }

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -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";















  }







































core/java/android/provider/DocumentsContract.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -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} */

































packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java



+12
−7




























Original line number
Diff line number
Diff line








@@ -393,6 +393,10 @@ public class DocumentsActivity extends BaseActivity {













    @Override















    public void updateActionBar() {















        if (mRootsToolbar != null) {













            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) {









@@ -402,6 +406,7 @@ public class DocumentsActivity extends BaseActivity {













                    mRootsToolbar.setTitle(R.string.title_save);















                }















            }













        }































        final RootInfo root = getCurrentRoot();















        final boolean showRootIcon = mShowAsDialog