PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUW: Cleanup intent extras

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

Use WizardManagerHelper definitions when possible

Change-Id: I4e6a503ae030b85486921fcacfc4fe03e37c8698
This commit is contained in:
Michael Bestas
2021-08-23 03:13:24 +03:00
committed by Timi Rautamäki
parent 5e2f7f2dfe
commit 885e3b363a
6 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
View File

@@ -26,7 +26,6 @@ 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_FIRST_RUN;
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;
@@ -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);
}