From 4c80659e99b182492a4719560180079d23c1b338 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Fri, 18 Nov 2016 14:33:21 -0800
Subject: [PATCH] DO NOT MERGE ANYWHERE

Using Activity#setTitle to have TalkBack announce root traversal.

Bug: 32260739
Bug: 28275570
Change-Id: I3b2b7c017d0c899fbccc8bc9b92453e715329317
---
 .../src/com/android/documentsui/BaseActivity.java           | 6 ++++++
 .../src/com/android/documentsui/FilesActivity.java          | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 1922773c9cb8f..a04a930d48e79 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -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();
     }
 
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
index 7186339dbfa62..233380e70a0d2 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
@@ -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