Add seperate activity for setup wizard wifi picker to adjust theme

Bug: 6517721

Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
This commit is contained in:
Michael Kolb
2012-05-18 10:54:31 -07:00
parent 1c0a8f953b
commit b5f006bf97
2 changed files with 37 additions and 4 deletions

View File

@@ -144,9 +144,7 @@
</activity-alias> </activity-alias>
<activity android:name=".wifi.WifiPickerActivity" <activity android:name=".wifi.WifiPickerActivity"
android:label="@string/wifi_setup_wizard_title" android:parentActivityName="Settings"
android:theme="@style/setup_wizard_theme"
android:icon="@drawable/empty_icon"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -155,6 +153,18 @@
</intent-filter> </intent-filter>
</activity> </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" <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
android:theme="@android:style/Theme.Holo.NoActionBar" android:theme="@android:style/Theme.Holo.NoActionBar"
android:screenOrientation="behind" android:screenOrientation="behind"

View File

@@ -0,0 +1,23 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.wifi;
import com.android.settings.ButtonBarHandler;
// dummy class for setup wizard theme
public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
}