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

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

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

* commit '87a4538034d41964ed81b69749939c1868505847':
  Allow to customize title of the dialog.
parents 5b2d1951 0cd62470

src/com/android/documentsui/DocumentsActivity.java

+12 −7
Original line number Diff line number Diff line
@@ -387,6 +387,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) {
@@ -396,6 +400,7 @@ public class DocumentsActivity extends BaseActivity { 
                    mRootsToolbar.setTitle(R.string.title_save);

                }

            }

        }



        final RootInfo root = getCurrentRoot();

        final boolean showRootIcon = mShowAsDialog