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

SUW: Intent changes for new Wi-Fi setup flow

Browse Source 
Change-Id: Ib79c7e709443eea9ec202efd1279dafcfb7951ad
This commit is contained in:
Michael Bestas
2021-08-24 02:01:57 +03:00
committed by Timi Rautamäki
parent b7b34b96a9
commit b3789b806f
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/lineageos/setupwizard/SetupWizardApp.java
View File

@@ -38,7 +38,7 @@ public class SetupWizardApp extends Application {
public static final String ACTION_SETUP_COMPLETE = public static final String ACTION_SETUP_COMPLETE =
"org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"; "org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE";
public static final String ACTION_FINISHED = "org.lineageos.setupwizard.SETUP_FINISHED"; public static final String ACTION_FINISHED = "org.lineageos.setupwizard.SETUP_FINISHED";
public static final String ACTION_SETUP_WIFI = "android.net.wifi.PICK_WIFI_NETWORK"; public static final String ACTION_SETUP_WIFI = "android.net.wifi.SETUP_WIFI_NETWORK";
public static final String ACTION_SETUP_BIOMETRIC = "android.settings.BIOMETRIC_ENROLL"; public static final String ACTION_SETUP_BIOMETRIC = "android.settings.BIOMETRIC_ENROLL";
public static final String ACTION_SETUP_LOCKSCREEN = "com.android.settings.SETUP_LOCK_SCREEN"; public static final String ACTION_SETUP_LOCKSCREEN = "com.android.settings.SETUP_LOCK_SCREEN";
public static final String ACTION_RESTORE_FROM_BACKUP = public static final String ACTION_RESTORE_FROM_BACKUP =
@@ -54,7 +54,9 @@ public class SetupWizardApp extends Application {
public static final String EXTRA_ACTION_ID = "actionId"; public static final String EXTRA_ACTION_ID = "actionId";
public static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode"; 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_SHOW_BUTTON_BAR = "extra_prefs_show_button_bar";
public static final String EXTRA_PREFS_SHOW_SKIP = "extra_prefs_show_skip";
public static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text"; public static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
public static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled"; public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
public static final String KEY_SEND_METRICS = "send_metrics"; public static final String KEY_SEND_METRICS = "send_metrics";

7
src/org/lineageos/setupwizard/WifiSetupActivity.java
View File

@@ -18,12 +18,16 @@
package org.lineageos.setupwizard; package org.lineageos.setupwizard;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_WIFI; import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_WIFI;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ENABLE_NEXT_ON_CONNECT;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT; import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_BUTTON_BAR; import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_BUTTON_BAR;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_SKIP;
import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_WIFI; import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_WIFI;
import android.content.Intent; import android.content.Intent;
import com.google.android.setupcompat.util.WizardManagerHelper;
import org.lineageos.setupwizard.util.SetupWizardUtils; import org.lineageos.setupwizard.util.SetupWizardUtils;
public class WifiSetupActivity extends WrapperSubBaseActivity { public class WifiSetupActivity extends WrapperSubBaseActivity {
@@ -37,8 +41,11 @@ public class WifiSetupActivity extends WrapperSubBaseActivity {
if (SetupWizardUtils.hasLeanback(this)) { if (SetupWizardUtils.hasLeanback(this)) {
intent.setComponent(SetupWizardUtils.sTvWifiSetupSettingsActivity); intent.setComponent(SetupWizardUtils.sTvWifiSetupSettingsActivity);
} }
intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true); intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true);
intent.putExtra(EXTRA_PREFS_SHOW_SKIP, true);
intent.putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null); intent.putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null);
intent.putExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, true);
startSubactivity(intent, REQUEST_CODE_SETUP_WIFI); startSubactivity(intent, REQUEST_CODE_SETUP_WIFI);
} }
} }