Loading src/com/android/settings/biometrics/BiometricEnrollIntroduction.java +23 −9 Original line number Diff line number Diff line Loading @@ -43,6 +43,8 @@ import com.google.android.setupdesign.span.LinkSpan; public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase implements LinkSpan.OnClickListener { private static final String KEY_CONFIRMING_CREDENTIALS = "confirming_credentials"; private UserManager mUserManager; private boolean mHasPassword; private boolean mBiometricUnlockDisabledByAdmin; Loading Loading @@ -127,6 +129,10 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (savedInstanceState != null) { mConfirmingCredentials = savedInstanceState.getBoolean(KEY_CONFIRMING_CREDENTIALS); } Intent intent = getIntent(); if (intent.getStringExtra(WizardManagerHelper.EXTRA_THEME) == null) { // Put the theme in the intent so it gets propagated to other activities in the flow Loading @@ -149,6 +155,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase mUserManager = UserManager.get(this); updatePasswordQuality(); if (!mConfirmingCredentials) { if (!mHasPassword) { // No password registered, launch into enrollment wizard. mConfirmingCredentials = true; Loading @@ -160,6 +167,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase launchConfirmLock(getConfirmLockTitleResId(), getChallenge()); } } } @Override protected void onResume() { Loading @@ -178,6 +186,12 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase } } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); outState.putBoolean(KEY_CONFIRMING_CREDENTIALS, mConfirmingCredentials); } @Override protected boolean shouldFinishWhenBackgrounded() { return super.shouldFinishWhenBackgrounded() && !mConfirmingCredentials && !mNextClicked; Loading Loading
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java +23 −9 Original line number Diff line number Diff line Loading @@ -43,6 +43,8 @@ import com.google.android.setupdesign.span.LinkSpan; public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase implements LinkSpan.OnClickListener { private static final String KEY_CONFIRMING_CREDENTIALS = "confirming_credentials"; private UserManager mUserManager; private boolean mHasPassword; private boolean mBiometricUnlockDisabledByAdmin; Loading Loading @@ -127,6 +129,10 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (savedInstanceState != null) { mConfirmingCredentials = savedInstanceState.getBoolean(KEY_CONFIRMING_CREDENTIALS); } Intent intent = getIntent(); if (intent.getStringExtra(WizardManagerHelper.EXTRA_THEME) == null) { // Put the theme in the intent so it gets propagated to other activities in the flow Loading @@ -149,6 +155,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase mUserManager = UserManager.get(this); updatePasswordQuality(); if (!mConfirmingCredentials) { if (!mHasPassword) { // No password registered, launch into enrollment wizard. mConfirmingCredentials = true; Loading @@ -160,6 +167,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase launchConfirmLock(getConfirmLockTitleResId(), getChallenge()); } } } @Override protected void onResume() { Loading @@ -178,6 +186,12 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase } } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); outState.putBoolean(KEY_CONFIRMING_CREDENTIALS, mConfirmingCredentials); } @Override protected boolean shouldFinishWhenBackgrounded() { return super.shouldFinishWhenBackgrounded() && !mConfirmingCredentials && !mNextClicked; Loading