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

Commit 50e8e64c authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev

parents e40bb555 4c80659e

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

+6 −0
Original line number Diff line number Diff line
@@ -387,6 +387,12 @@ public abstract class BaseActivity extends Activity 
        }



        mNavigator.update();

        // Causes talkback to announce the activity's new title

        if (mState.stack.isRecents()) {

            setTitle(mRoots.getRecentsRoot().title);

        } else {

            setTitle(mState.stack.getTitle());

        }

        invalidateOptionsMenu();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class FilesActivity extends BaseActivity { 
        Intent intent = getIntent();

        return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))

                ? intent.getStringExtra(Intent.EXTRA_TITLE)

                : getTitle().toString();

                : getString(R.string.downloads_label);

    }



    @Override