DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."

This reverts commit 4c80659e99b182492a4719560180079d23c1b338.

Change-Id: Id5fa68f37170e61e2e63fdb3a60e8a3db79c81fa

2 files changed, 1 insertions, 7 deletions

diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index a04a930d48e7..1922773c9cb8 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -387,12 +387,6 @@ 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 233380e70a0d..7186339dbfa6 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)
-                : getString(R.string.downloads_label);
+                : getTitle().toString();
     }
 
     @Override