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

Fix work account setup lock screen content for face auth am: 5604585930

Browse Source 
am: 209c049dca

Change-Id: Id5f58f33fcb3217833537fc6ccd6c7fc17e0ecc9
This commit is contained in:
Curtis Belmonte
2019-07-08 17:30:53 -07:00
committed by android-build-merger
parent c9197ed237 209c049dca
commit c29bf8d9cc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -111,7 +111,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
int titleResource = mForFingerprint ?
int titleResource = isForBiometric() ?
R.string.lock_settings_picker_title : R.string.setup_lock_settings_picker_title;
if (getActivity() != null) {
getActivity().setTitle(titleResource);
@@ -125,7 +125,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
@Override
protected void addHeaderView() {
if (mForFingerprint || mForFace) {
if (isForBiometric()) {
setHeaderView(R.layout.setup_choose_lock_generic_biometrics_header);
} else {
setHeaderView(R.layout.setup_choose_lock_generic_header);
@@ -183,7 +183,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
@Override
protected void addPreferences() {
if (mForFingerprint) {
if (isForBiometric()) {
super.addPreferences();
} else {
addPreferencesFromResource(R.xml.setup_security_settings_picker);
@@ -240,6 +240,10 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
return intent;
}
private boolean isForBiometric() {
return mForFingerprint || mForFace;
}
}
public static class InternalActivity extends ChooseLockGeneric.InternalActivity {
@@ -261,5 +265,4 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
}
}
}
}