Show split screen dialog on the introduction and enrolling page.
Revert ag/22361082 and ag/22460413, show the split screen dialog on the introduction and enrolling page, instead of relying on the callers to show the dialog. Test: atest BiometricsSplitScreenDialogTest Test: atest FaceEnrollIntroductionTest Test: atest SetupFingerprintEnrollIntroductionTest Bug: 299573056 Change-Id: Ieb106a4a623ad5ca0e6eb1633413df75767bef52
This commit is contained in:
@@ -154,6 +154,12 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if (shouldShowSplitScreenDialog()) {
|
||||
BiometricsSplitScreenDialog
|
||||
.newInstance(getModality(), !WizardManagerHelper.isAnySetupWizard(getIntent()))
|
||||
.show(getSupportFragmentManager(), BiometricsSplitScreenDialog.class.getName());
|
||||
}
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
mConfirmingCredentials = savedInstanceState.getBoolean(KEY_CONFIRMING_CREDENTIALS);
|
||||
mHasScrolledToBottom = savedInstanceState.getBoolean(KEY_SCROLLED_TO_BOTTOM);
|
||||
@@ -293,6 +299,13 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
|
||||
|
||||
@Override
|
||||
protected void onNextButtonClick(View view) {
|
||||
// If it's not on suw, this method shouldn't be accessed.
|
||||
if (shouldShowSplitScreenDialog() && WizardManagerHelper.isAnySetupWizard(getIntent())) {
|
||||
BiometricsSplitScreenDialog.newInstance(getModality(), false /*destroyActivity*/)
|
||||
.show(getSupportFragmentManager(), BiometricsSplitScreenDialog.class.getName());
|
||||
return;
|
||||
}
|
||||
|
||||
mNextClicked = true;
|
||||
if (checkMaxEnrolled() == 0) {
|
||||
// Lock thingy is already set up, launch directly to the next page
|
||||
|
||||
Reference in New Issue
Block a user