SUW: Cleanup intent extras

Remove unused extras:
allowSkip: Removed in 2015
wifi_auto_finish_on_connect: Removed in 2016

Use WizardManagerHelper definitions when possible

Change-Id: I4e6a503ae030b85486921fcacfc4fe03e37c8698

6 files changed, 12 insertions, 28 deletions

diff --git a/src/com/aicp/setupwizard/BaseSetupWizardActivity.java b/src/com/aicp/setupwizard/BaseSetupWizardActivity.java
index eb54ac0..fed45d5 100644
--- a/src/com/aicp/setupwizard/BaseSetupWizardActivity.java
+++ b/src/com/aicp/setupwizard/BaseSetupWizardActivity.java
@@ -26,7 +26,6 @@ import static com.aicp.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL;
 import static com.aicp.setupwizard.SetupWizardApp.ACTION_NEXT;
 import static com.aicp.setupwizard.SetupWizardApp.ACTION_SETUP_COMPLETE;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
-import static com.aicp.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_HAS_MULTIPLE_USERS;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
@@ -561,7 +560,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
         if (LOGV) {
             Log.v(TAG, "starting activity " + intent);
         }
-        intent.putExtra(EXTRA_FIRST_RUN, isFirstRun());
+        intent.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, isFirstRun());
         intent.putExtra(EXTRA_HAS_MULTIPLE_USERS, hasMultipleUsers());
         startActivity(intent);
     }
@@ -570,7 +569,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
         if (LOGV) {
             Log.v(TAG, "startFirstRunActivityForResult requestCode=" + requestCode);
         }
-        intent.putExtra(EXTRA_FIRST_RUN, isFirstRun());
+        intent.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, isFirstRun());
         intent.putExtra(EXTRA_HAS_MULTIPLE_USERS, hasMultipleUsers());
         startActivityForResult(intent, requestCode);
     }
diff --git a/src/com/aicp/setupwizard/BiometricActivity.java b/src/com/aicp/setupwizard/BiometricActivity.java
index 57718b5..493f1dd 100644
--- a/src/com/aicp/setupwizard/BiometricActivity.java
+++ b/src/com/aicp/setupwizard/BiometricActivity.java
@@ -18,12 +18,7 @@
 package com.aicp.setupwizard;
 
 import static com.aicp.setupwizard.SetupWizardApp.ACTION_SETUP_BIOMETRIC;
-import static com.aicp.setupwizard.SetupWizardApp.EXTRA_ALLOW_SKIP;
-import static com.aicp.setupwizard.SetupWizardApp.EXTRA_AUTO_FINISH;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_DETAILS;
-import static com.aicp.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
-import static com.aicp.setupwizard.SetupWizardApp.EXTRA_MATERIAL_LIGHT;
-import static com.aicp.setupwizard.SetupWizardApp.EXTRA_THEME;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_TITLE;
 import static com.aicp.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_BIOMETRIC;
 
@@ -33,6 +28,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.util.ThemeHelper;
 
 import com.aicp.setupwizard.util.SetupWizardUtils;
 
@@ -83,11 +79,7 @@ public class BiometricActivity extends SubBaseActivity {
 
     private void launchBiometricSetup() {
         Intent intent = new Intent(ACTION_SETUP_BIOMETRIC);
-        intent.putExtra(EXTRA_FIRST_RUN, true);
-        intent.putExtra(EXTRA_ALLOW_SKIP, true);
-        intent.putExtra(EXTRA_THEME, EXTRA_MATERIAL_LIGHT);
-        intent.putExtra(EXTRA_AUTO_FINISH, false);
-            /*intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_FALLBACK, true);*/
+        intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_MATERIAL_LIGHT);
         intent.putExtra(EXTRA_TITLE,
                 getString(getTitleResId()));
         intent.putExtra(EXTRA_DETAILS,
diff --git a/src/com/aicp/setupwizard/ScreenLockActivity.java b/src/com/aicp/setupwizard/ScreenLockActivity.java
index d2e6c6b..198f5a0 100644
--- a/src/com/aicp/setupwizard/ScreenLockActivity.java
+++ b/src/com/aicp/setupwizard/ScreenLockActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,6 @@ public class ScreenLockActivity extends SubBaseActivity {
                 getString(R.string.settings_lockscreen_setup_title));
         intent.putExtra(EXTRA_DETAILS,
                 getString(R.string.settings_lockscreen_setup_details));
-        intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
         startSubactivity(intent, REQUEST_CODE_SETUP_LOCKSCREEN);
     }
 
diff --git a/src/com/aicp/setupwizard/SetupWizardApp.java b/src/com/aicp/setupwizard/SetupWizardApp.java
index cd75361..2b28364 100644
--- a/src/com/aicp/setupwizard/SetupWizardApp.java
+++ b/src/com/aicp/setupwizard/SetupWizardApp.java
@@ -44,13 +44,7 @@ public class SetupWizardApp extends Application {
     public static final String ACTION_NEXT = "com.android.wizard.NEXT";
     public static final String ACTION_LOAD = "com.android.wizard.LOAD";
 
-
-    public static final String EXTRA_FIRST_RUN = "firstRun";
-    public static final String EXTRA_ALLOW_SKIP = "allowSkip";
-    public static final String EXTRA_AUTO_FINISH = "wifi_auto_finish_on_connect";
     public static final String EXTRA_HAS_MULTIPLE_USERS = "hasMultipleUsers";
-    public static final String EXTRA_THEME = "theme";
-    public static final String EXTRA_MATERIAL_LIGHT = "material_light";
     public static final String EXTRA_TITLE = "title";
     public static final String EXTRA_DETAILS = "details";
     public static final String EXTRA_SCRIPT_URI = "scriptUri";
@@ -58,7 +52,6 @@ public class SetupWizardApp extends Application {
     public static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
     public static final String EXTRA_PREFS_SHOW_BUTTON_BAR = "extra_prefs_show_button_bar";
     public static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
-    public static final String EXTRA_IS_SETUP_FLOW = "isSetupFlow";
 
     public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
     public static final String ENABLE_RECOVERY_UPDATE = "enable_recovery_update";
diff --git a/src/com/aicp/setupwizard/WifiSetupActivity.java b/src/com/aicp/setupwizard/WifiSetupActivity.java
index e0a08e5..c0ad753 100644
--- a/src/com/aicp/setupwizard/WifiSetupActivity.java
+++ b/src/com/aicp/setupwizard/WifiSetupActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2018,2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 package com.aicp.setupwizard;
 
 import static com.aicp.setupwizard.SetupWizardApp.ACTION_SETUP_WIFI;
+import static com.aicp.setupwizard.SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT;
+import static com.aicp.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_BUTTON_BAR;
 import static com.aicp.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_WIFI;
 
 import android.content.Intent;
@@ -36,8 +38,8 @@ public class WifiSetupActivity extends WrapperSubBaseActivity {
         if (SetupWizardUtils.hasLeanback(this)) {
             intent.setComponent(SetupWizardUtils.mTvwifisettingsActivity);
         }
-        intent.putExtra(SetupWizardApp.EXTRA_PREFS_SHOW_BUTTON_BAR, true);
-        intent.putExtra(SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT, (String) null);
+        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true);
+        intent.putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null);
         startSubactivity(intent, REQUEST_CODE_SETUP_WIFI);
     }
 }
diff --git a/src/com/aicp/setupwizard/wizardmanager/WizardManager.java b/src/com/aicp/setupwizard/wizardmanager/WizardManager.java
index f6969ee..5225cee 100644
--- a/src/com/aicp/setupwizard/wizardmanager/WizardManager.java
+++ b/src/com/aicp/setupwizard/wizardmanager/WizardManager.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ package com.aicp.setupwizard.wizardmanager;
 import static com.aicp.setupwizard.SetupWizardApp.ACTION_LOAD;
 import static com.aicp.setupwizard.SetupWizardApp.ACTION_NEXT;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
-import static com.aicp.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
 import static com.aicp.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
 import static com.aicp.setupwizard.SetupWizardApp.LOGV;
@@ -87,7 +86,7 @@ public class WizardManager extends Activity {
     }
 
     private void addExtras(Intent intent) {
-        intent.putExtra(EXTRA_FIRST_RUN, true);
+        intent.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true);
         intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_MATERIAL_LIGHT);
     }