commit 1a8a6e0baabf636f9b429280cba536450d594089
author Hyunyoung Song <hyunyoungs@google.com> Fri Jun 26 04:08:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 26 04:08:14 2015 +0000
tree b23c9d80647aef3e6fbfa5237ae5ab2c3d1eea36
parent 187f9665f69745518ebc65327bd662cab3f90cb8
parent 166e6488e60f0d19cfc70e10a0fb95c9462894a6

Merge "Announce content desc of workspace immediately after unlocking the lock screen. b/22051420" into ub-launcher3-burnaby

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index b70d6d0..a995f08 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3519,6 +3519,8 @@
             text.add(getString(R.string.all_apps_button_label));
         } else if (mState == State.WIDGETS) {
             text.add(getString(R.string.widget_button_text));
+        } else if (mWorkspace != null) {
+            text.add(mWorkspace.getCurrentPageDescription());
         } else {
             text.add(getString(R.string.all_apps_home_button_label));
         }