From 7dfa323c811463a4e989990ff488da0067891ca3 Mon Sep 17 00:00:00 2001 From: Ajay Nadathur Date: Thu, 16 Jun 2016 14:07:27 -0700 Subject: [PATCH] [SetupWizard] Fix talkback on lock screen. - On volantis, talkback will now speak 'Protect your tablet' instead of 'Choose screen lock' Testing: ------- - Tested and verified on volantis Change-Id: If010ab8f3fcd107b99294081765a52e98ed8cc1f --- src/com/android/settings/SetupChooseLockGeneric.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java index f561609c5e8..71679f30a80 100644 --- a/src/com/android/settings/SetupChooseLockGeneric.java +++ b/src/com/android/settings/SetupChooseLockGeneric.java @@ -85,10 +85,14 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { R.dimen.suw_items_glif_text_divider_inset)); layout.setIcon(getContext().getDrawable(R.drawable.ic_lock)); - layout.setHeaderText(mForFingerprint ? - R.string.lock_settings_picker_title - : R.string.setup_lock_settings_picker_title); + int titleResource = mForFingerprint ? + R.string.lock_settings_picker_title : R.string.setup_lock_settings_picker_title; + if (getActivity() != null) { + getActivity().setTitle(titleResource); + } + + layout.setHeaderText(titleResource); // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in // PreferenceFragment. setDivider(null);