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

This commit is contained in:
Hyunyoung Song 2015-06-26 04:08:14 +00:00 committed by Android (Google) Code Review
commit 1a8a6e0baa
1 changed files with 2 additions and 0 deletions

View File

@ -3519,6 +3519,8 @@ public class Launcher extends Activity
text.add(getString(R.string.all_apps_button_label)); text.add(getString(R.string.all_apps_button_label));
} else if (mState == State.WIDGETS) { } else if (mState == State.WIDGETS) {
text.add(getString(R.string.widget_button_text)); text.add(getString(R.string.widget_button_text));
} else if (mWorkspace != null) {
text.add(mWorkspace.getCurrentPageDescription());
} else { } else {
text.add(getString(R.string.all_apps_home_button_label)); text.add(getString(R.string.all_apps_home_button_label));
} }