PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: eddcd7d085

Change-Id: I8b4780b65a3088b3b7937d9c88326ace67a9e90d
This commit is contained in:
Ajay Nadathur
2016-06-17 01:45:44 +00:00
committed by android-build-merger
parent 00a6fd6df2 eddcd7d085
commit 10c74d81df
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/SetupChooseLockGeneric.java
View File

@@ -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);