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

Browse Source 
am: 5604585930

Change-Id: Id6044f31b68d7b36a40b165be639bc58cc0e8b33
This commit is contained in:
Curtis Belmonte
2019-07-08 17:10:55 -07:00
committed by android-build-merger
parent 34cf96e241 5604585930
commit 209c049dca
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)); 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; R.string.lock_settings_picker_title : R.string.setup_lock_settings_picker_title;
if (getActivity() != null) { if (getActivity() != null) {
getActivity().setTitle(titleResource); getActivity().setTitle(titleResource);
@@ -125,7 +125,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
@Override @Override
protected void addHeaderView() { protected void addHeaderView() {
if (mForFingerprint || mForFace) { if (isForBiometric()) {
setHeaderView(R.layout.setup_choose_lock_generic_biometrics_header); setHeaderView(R.layout.setup_choose_lock_generic_biometrics_header);
} else { } else {
setHeaderView(R.layout.setup_choose_lock_generic_header); setHeaderView(R.layout.setup_choose_lock_generic_header);
@@ -183,7 +183,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
@Override @Override
protected void addPreferences() { protected void addPreferences() {
if (mForFingerprint) { if (isForBiometric()) {
super.addPreferences(); super.addPreferences();
} else { } else {
addPreferencesFromResource(R.xml.setup_security_settings_picker); addPreferencesFromResource(R.xml.setup_security_settings_picker);
@@ -240,6 +240,10 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent); SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
return intent; return intent;
} }
private boolean isForBiometric() {
return mForFingerprint || mForFace;
}
} }
public static class InternalActivity extends ChooseLockGeneric.InternalActivity { public static class InternalActivity extends ChooseLockGeneric.InternalActivity {
@@ -261,5 +265,4 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
} }
} }
} }
} }