commit 0f17d09dcd4e8e40eb28cd4e549e42e45019ef98
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Oct 22 05:19:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 22 05:19:55 2016 +0000
tree b30678173d839298c6a4a8cb9089b22b45c424a8
parent 9a04856622716dd34dfb5fe80206df8974df19d6
parent 37408d06cf31cde66312e677a14ba5520a0d1b2c

Merge "Using Activity#setTitle to have TalkBack announce root traversal." into nyc-andromeda-dev

src/com/android/documentsui/BaseActivity.java

diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 96b6832..e9360ab 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -431,6 +431,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();
     }
 

src/com/android/documentsui/files/FilesActivity.java

diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 7a2284f..a62e6af 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -217,7 +217,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