From 04c9f463d5b73013ed046c93c166011011bcc153 Mon Sep 17 00:00:00 2001 From: Oliver Scott Date: Sat, 6 Jan 2024 20:36:13 -0500 Subject: [PATCH] Use WizardManagerHelper NEXT intent and result codes The helper function copies all relevant extras Change-Id: I1ebb48dd2e2a2ba0881c6a3382996c2243d84140 --- .../setupwizard/BaseSetupWizardActivity.java | 19 +++--------------- .../setupwizard/DeviceSpecificActivity.java | 13 ++---------- .../setupwizard/LineageSettingsActivity.java | 16 --------------- .../NavigationSettingsActivity.java | 4 +--- .../lineageos/setupwizard/SetupWizardApp.java | 1 - .../setupwizard/UpdateRecoveryActivity.java | 14 ++++--------- .../backup/RestoreIntroActivity.java | 20 ------------------- .../wizardmanager/WizardManager.java | 3 ++- 8 files changed, 12 insertions(+), 78 deletions(-) diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java index 962746c8..0afccc06 100644 --- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java +++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java @@ -25,12 +25,8 @@ import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP; import static org.lineageos.setupwizard.SetupWizardApp.ACTION_ACCESSIBILITY_SETTINGS; import static org.lineageos.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL; -import static org.lineageos.setupwizard.SetupWizardApp.ACTION_NEXT; import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_COMPLETE; -import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID; import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_HAS_MULTIPLE_USERS; -import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE; -import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI; import static org.lineageos.setupwizard.SetupWizardApp.LOGV; import android.annotation.NonNull; @@ -46,13 +42,10 @@ import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; import android.util.Log; import android.view.View; -import android.view.animation.Animation; -import android.view.animation.AnimationUtils; import android.widget.Button; import com.android.settingslib.Utils; @@ -234,11 +227,11 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga } protected void onNextPressed() { - nextAction(NEXT_REQUEST); + nextAction(RESULT_OK); } protected void onSkipPressed() { - nextAction(NEXT_REQUEST); + nextAction(RESULT_SKIP); } protected void setNextText(int resId) { @@ -436,13 +429,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga if (LOGV) { Log.v(TAG, "sendActionResults resultCode=" + mResultCode + " data=" + mResultData); } - Intent intent = new Intent(ACTION_NEXT); - intent.putExtra(EXTRA_SCRIPT_URI, getIntent().getStringExtra(EXTRA_SCRIPT_URI)); - intent.putExtra(EXTRA_ACTION_ID, getIntent().getStringExtra(EXTRA_ACTION_ID)); - intent.putExtra(EXTRA_RESULT_CODE, mResultCode); - if (!(mResultData == null || mResultData.getExtras() == null)) { - intent.putExtras(mResultData.getExtras()); - } + Intent intent = WizardManagerHelper.getNextIntent(getIntent(), mResultCode, mResultData); startActivityForResult(intent, NEXT_REQUEST); } diff --git a/src/org/lineageos/setupwizard/DeviceSpecificActivity.java b/src/org/lineageos/setupwizard/DeviceSpecificActivity.java index 9c12e958..3d1467d1 100644 --- a/src/org/lineageos/setupwizard/DeviceSpecificActivity.java +++ b/src/org/lineageos/setupwizard/DeviceSpecificActivity.java @@ -16,13 +16,10 @@ package org.lineageos.setupwizard; -import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; -import com.google.android.setupcompat.util.WizardManagerHelper; - import org.lineageos.setupwizard.util.SetupWizardUtils; public class DeviceSpecificActivity extends BaseSetupWizardActivity { @@ -40,7 +37,7 @@ public class DeviceSpecificActivity extends BaseSetupWizardActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_CODE_SETUP_DEVICE) { if (resultCode == RESULT_OK) { - goToNextPage(); + nextAction(RESULT_OK); } else { finish(); } @@ -63,14 +60,8 @@ public class DeviceSpecificActivity extends BaseSetupWizardActivity { startActivityForResult(intent, REQUEST_CODE_SETUP_DEVICE); } else { SetupWizardUtils.disableComponent(this, DeviceSpecificActivity.class); - goToNextPage(); + nextAction(RESULT_OK); finish(); } } - - private void goToNextPage() { - applyForwardTransition(TRANSITION_ID_SLIDE); - Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK); - nextAction(NEXT_REQUEST, intent); - } } diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java index 9d1055c2..a716efb2 100644 --- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java +++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java @@ -20,25 +20,15 @@ package org.lineageos.setupwizard; import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS; import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS; -import android.app.Activity; import android.content.Context; -import android.content.Intent; -import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; import android.text.Spannable; -import android.text.SpannableString; import android.text.SpannableStringBuilder; -import android.text.Spanned; -import android.text.method.LinkMovementMethod; -import android.text.style.ClickableSpan; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.TextView; -import com.google.android.setupcompat.util.WizardManagerHelper; - import lineageos.hardware.LineageHardwareManager; import lineageos.providers.LineageSettings; @@ -112,12 +102,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { updateMetricsOption(); } - @Override - protected void onNextPressed() { - Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK); - nextAction(NEXT_REQUEST, intent); - } - @Override protected int getLayoutResId() { return R.layout.setup_lineage_settings; diff --git a/src/org/lineageos/setupwizard/NavigationSettingsActivity.java b/src/org/lineageos/setupwizard/NavigationSettingsActivity.java index 87fdd4ef..d671bbe6 100644 --- a/src/org/lineageos/setupwizard/NavigationSettingsActivity.java +++ b/src/org/lineageos/setupwizard/NavigationSettingsActivity.java @@ -32,7 +32,6 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import android.content.Context; import android.view.View; import android.widget.CheckBox; import android.widget.RadioButton; @@ -190,8 +189,7 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity { LineageSettings.System.NAVIGATION_BAR_HINT, hideHint ? 0 : 1, UserHandle.USER_CURRENT); } - Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK); - nextAction(NEXT_REQUEST, intent); + super.onNextPressed(); } @Override diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java index 51d65aff..60badf92 100644 --- a/src/org/lineageos/setupwizard/SetupWizardApp.java +++ b/src/org/lineageos/setupwizard/SetupWizardApp.java @@ -44,7 +44,6 @@ public class SetupWizardApp extends Application { public static final String ACTION_RESTORE_FROM_BACKUP = "com.stevesoltys.seedvault.RESTORE_BACKUP"; public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL"; - 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_HAS_MULTIPLE_USERS = "hasMultipleUsers"; diff --git a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java index 22968047..1e96a81a 100644 --- a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java +++ b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java @@ -16,19 +16,17 @@ package org.lineageos.setupwizard; +import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP; + import static org.lineageos.setupwizard.SetupWizardApp.ENABLE_RECOVERY_UPDATE; import static org.lineageos.setupwizard.SetupWizardApp.UPDATE_RECOVERY_PROP; -import android.app.Activity; -import android.content.Intent; import android.os.Bundle; import android.os.SystemProperties; import android.util.Log; import android.view.View; import android.widget.CheckBox; -import com.google.android.setupcompat.util.WizardManagerHelper; - import org.lineageos.setupwizard.util.SetupWizardUtils; public class UpdateRecoveryActivity extends BaseSetupWizardActivity { @@ -47,9 +45,7 @@ public class UpdateRecoveryActivity extends BaseSetupWizardActivity { if (!SetupWizardUtils.hasRecoveryUpdater(this)) { Log.v(TAG, "No recovery updater, skipping UpdateRecoveryActivity"); - - Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK); - nextAction(NEXT_REQUEST, intent); + nextAction(RESULT_SKIP); finish(); return; } @@ -84,9 +80,7 @@ public class UpdateRecoveryActivity extends BaseSetupWizardActivity { protected void onNextPressed() { mSetupWizardApp.getSettingsBundle().putBoolean(ENABLE_RECOVERY_UPDATE, mRecoveryUpdateCheckbox.isChecked()); - - Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK); - nextAction(NEXT_REQUEST, intent); + super.onNextPressed(); } @Override diff --git a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java index dd154dc5..33219c7a 100644 --- a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java +++ b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java @@ -20,15 +20,9 @@ package org.lineageos.setupwizard.backup; import static org.lineageos.setupwizard.SetupWizardApp.ACTION_RESTORE_FROM_BACKUP; import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_RESTORE; -import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.widget.TextView; -import com.google.android.setupcompat.util.WizardManagerHelper; -import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP; - -import org.lineageos.setupwizard.NavigationLayout; import org.lineageos.setupwizard.R; import org.lineageos.setupwizard.SubBaseActivity; @@ -51,20 +45,6 @@ public class RestoreIntroActivity extends SubBaseActivity { launchRestore(); } - @Override - protected void onSkipPressed() { - Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK); - nextAction(NEXT_REQUEST, intent); - } - - protected void onSubactivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode == RESULT_SKIP) { - onSkipPressed(); - } else { - super.onSubactivityResult(requestCode, resultCode, data); - } - } - @Override protected int getLayoutResId() { return R.layout.intro_restore_activity; diff --git a/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java b/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java index ac2e5199..3af3c42f 100644 --- a/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java +++ b/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java @@ -17,8 +17,9 @@ package org.lineageos.setupwizard.wizardmanager; +import static com.google.android.setupcompat.util.WizardManagerHelper.ACTION_NEXT; + import static org.lineageos.setupwizard.SetupWizardApp.ACTION_LOAD; -import static org.lineageos.setupwizard.SetupWizardApp.ACTION_NEXT; import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID; import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE; import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;