commit 334cd1bce7d771c7792ef7335694407d6471c50a
author Michael Bestas <mkbestas@lineageos.org> Sat Oct 09 01:55:56 2021 +0300
committer Michael Bestas <mkbestas@lineageos.org> Wed Dec 29 01:05:24 2021 +0200
tree 614805c41806d75ed388fa62d714faafcf98c265
parent 0e9b6ebcbfe4cae9b98011bc86bf62faa909bf58

Changes for new network setup flow

* Remove mobile data/choose data sim pages
* Rename Wi-Fi setup to network setup
* Switch to the new NetworkProviderSettings which contains
  both Wi-Fi and mobile data setup.

Change-Id: I1c618d629628740e39dbed313d468d1efe971ed7

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 80a36ec..cc1d37e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -150,32 +150,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".WifiSetupActivity"
-                  android:label="@string/activity_label_empty"
-                  android:excludeFromRecents="true"
-                  android:configChanges="mcc|mnc"
-                  android:immersive="true"
-                  android:exported="false"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_WIFI_SETUP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".CaptivePortalSetupActivity"
-                  android:label="@string/activity_label_empty"
-                  android:excludeFromRecents="true"
-                  android:configChanges="mcc|mnc"
-                  android:immersive="true"
-                  android:exported="false"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_CAPTIVE_PORTAL_SETUP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity android:name=".SimMissingActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
@@ -189,7 +163,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ChooseDataSimActivity"
+        <activity android:name=".NetworkSetupActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
@@ -197,12 +171,12 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_CHOOSE_DATA_SIM" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".MobileDataActivity"
+        <activity android:name=".CaptivePortalSetupActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
@@ -210,7 +184,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_ENABLE_MOBILE_DATA" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_CAPTIVE_PORTAL_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>