commit 50e8e64c45d22655ac548e43531ef8905e660c84
author Ben Lin <linben@google.com> Tue Dec 13 01:34:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 13 01:34:43 2016 +0000
tree 831053b646b7eb0934bff3cc94bee5d89772136d
parent e40bb555d836b0f9e06038b2f7df27039200d164
parent 4c80659e99b182492a4719560180079d23c1b338

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

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

diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 1922773..a04a930 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -387,6 +387,12 @@
         }
 
         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

diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
index 7186339..233380e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
@@ -192,7 +192,7 @@
         Intent intent = getIntent();
         return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))
                 ? intent.getStringExtra(Intent.EXTRA_TITLE)
-                : getTitle().toString();
+                : getString(R.string.downloads_label);
     }
 
     @Override