commit b5f006bf971e9a3390cc8b9a2fb4ee2861f6dbef
author Michael Kolb <kolby@google.com> Fri May 18 10:54:31 2012 -0700
committer Michael Kolb <kolby@google.com> Fri May 18 11:23:48 2012 -0700
tree c40ea8cb1be7d51585ddf75e98265f9cea3c4f0c
parent 1c0a8f953ba85bd21660a44dbbf891f313367196

Add seperate activity for setup wizard wifi picker to adjust theme

  Bug: 6517721

Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d73d2f6..62ca8fc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -144,10 +144,8 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                  android:label="@string/wifi_setup_wizard_title"
-                  android:theme="@style/setup_wizard_theme"
-                  android:icon="@drawable/empty_icon"
-                  android:clearTaskOnLaunch="true">
+                android:parentActivityName="Settings"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -155,6 +153,18 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".wifi.WifiSetupActivity"
+            android:theme="@style/setup_wizard_theme"
+            android:label="@string/wifi_setup_wizard_title"
+                android:icon="@drawable/empty_icon"
+            android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
                   android:theme="@android:style/Theme.Holo.NoActionBar"
                   android:screenOrientation="behind"