From 6d9381382960bf3fa2f50a367e661691c5fd9f80 Mon Sep 17 00:00:00 2001 From: d34d Date: Mon, 13 Jul 2015 12:02:23 -0700 Subject: [PATCH] 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 --- .../cyanogenmod/setupwizard/setup/CMSetupWizardData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index d8fbabc..e4bb6a5 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -50,9 +50,6 @@ public class CMSetupWizardData extends AbstractSetupData { pages.add(new BluetoothSetupPage(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)); if (SetupWizardUtils.hasTelephony(mContext)) { pages.add(new SimCardMissingPage(mContext, this) @@ -72,6 +69,9 @@ public class CMSetupWizardData extends AbstractSetupData { if (!SetupWizardUtils.hasLeanback(mContext)) { 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 OtherSettingsPage(mContext, this)); pages.add(new DateTimePage(mContext, this));