diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-06-26 04:08:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 04:08:14 +0000 |
| commit | 1a8a6e0baabf636f9b429280cba536450d594089 (patch) | |
| tree | b23c9d80647aef3e6fbfa5237ae5ab2c3d1eea36 | |
| parent | 187f9665f69745518ebc65327bd662cab3f90cb8 (diff) | |
| parent | 166e6488e60f0d19cfc70e10a0fb95c9462894a6 (diff) | |
| download | android_packages_apps_Trebuchet-1a8a6e0baabf636f9b429280cba536450d594089.tar.gz android_packages_apps_Trebuchet-1a8a6e0baabf636f9b429280cba536450d594089.tar.bz2 android_packages_apps_Trebuchet-1a8a6e0baabf636f9b429280cba536450d594089.zip | |
Merge "Announce content desc of workspace immediately after unlocking the lock screen. b/22051420" into ub-launcher3-burnaby
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index b70d6d0b3..a995f0813 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3519,6 +3519,8 @@ public class Launcher extends Activity 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)); } |