Merge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev

This commit is contained in:
Ajay Kumar Nadathur Sreenivasan
2016-06-17 01:18:00 +00:00
committed by Android (Google) Code Review

View File

@@ -85,10 +85,14 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
R.dimen.suw_items_glif_text_divider_inset)); R.dimen.suw_items_glif_text_divider_inset));
layout.setIcon(getContext().getDrawable(R.drawable.ic_lock)); 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 // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
// PreferenceFragment. // PreferenceFragment.
setDivider(null); setDivider(null);