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

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

Browse Source
This commit is contained in:
Ben Lin
2016-12-13 01:34:39 +00:00
committed by Android (Google) Code Review
parent e40bb555d8 4c80659e99
commit 50e8e64c45
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
View File

@@ -387,6 +387,12 @@ public abstract class BaseActivity extends Activity
} }
mNavigator.update(); 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(); invalidateOptionsMenu();
} }

2
packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
View File

@@ -192,7 +192,7 @@ public class FilesActivity extends BaseActivity {
Intent intent = getIntent(); Intent intent = getIntent();
return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE)) return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))
? intent.getStringExtra(Intent.EXTRA_TITLE) ? intent.getStringExtra(Intent.EXTRA_TITLE)
: getTitle().toString(); : getString(R.string.downloads_label);
} }
@Override @Override