Move fingerprint setup to end of OOBE

Fingerprint setup should occur after the user has setup any accounts
and before the customization page.

Change-Id: I1305d89e17da1f8d405c8bd5b8b8b5268a2ba38c
This commit is contained in:
d34d 2015-07-13 12:02:23 -07:00 committed by Gerrit Code Review
parent eff742708f
commit 6d93813829

View File

@ -50,9 +50,6 @@ public class CMSetupWizardData extends AbstractSetupData {
pages.add(new BluetoothSetupPage(mContext, this)); pages.add(new BluetoothSetupPage(mContext, this));
} }
pages.add(new WelcomePage(mContext, this)); pages.add(new WelcomePage(mContext, this));
if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) {
pages.add(new FingerprintSetupPage(mContext, this));
}
pages.add(new WifiSetupPage(mContext, this)); pages.add(new WifiSetupPage(mContext, this));
if (SetupWizardUtils.hasTelephony(mContext)) { if (SetupWizardUtils.hasTelephony(mContext)) {
pages.add(new SimCardMissingPage(mContext, this) pages.add(new SimCardMissingPage(mContext, this)
@ -72,6 +69,9 @@ public class CMSetupWizardData extends AbstractSetupData {
if (!SetupWizardUtils.hasLeanback(mContext)) { if (!SetupWizardUtils.hasLeanback(mContext)) {
pages.add(new CyanogenServicesPage(mContext, this).setHidden(true)); pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
} }
if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) {
pages.add(new FingerprintSetupPage(mContext, this));
}
pages.add(new CyanogenSettingsPage(mContext, this)); pages.add(new CyanogenSettingsPage(mContext, this));
pages.add(new OtherSettingsPage(mContext, this)); pages.add(new OtherSettingsPage(mContext, this));
pages.add(new DateTimePage(mContext, this)); pages.add(new DateTimePage(mContext, this));