Rewire BiometricEnrollActivity to setup pages
When running in setup flow: - If fingerprint enrollment is desired, go to SetupFingerprintEnrollIntroduction - Makes sure WizardManagerHelper.copyWizardManagerExtras is called to propagate the extras from the incoming intent, propagating extras like whether we are in initial / deferred setup flow, theme, etc. - Forward the result code in BiometricEnrollActivity using FLAG_ACTIVITY_FORWARD_RESULT Bug: 120797018 Test: Manual Change-Id: Ibc0ecc035141d62339f5f664346ed108570e0905
This commit is contained in:
@@ -36,6 +36,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
|
||||
import com.google.android.setupcompat.template.FooterBarMixin;
|
||||
import com.google.android.setupcompat.template.FooterButton;
|
||||
import com.google.android.setupcompat.util.WizardManagerHelper;
|
||||
import com.google.android.setupdesign.span.LinkSpan;
|
||||
|
||||
public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
|
||||
@@ -166,6 +167,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
|
||||
intent.setClass(this, FaceEnrollEnrolling.class);
|
||||
}
|
||||
intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, mSwitchDiversity.isChecked());
|
||||
WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
|
||||
return intent;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user