diff options
| -rw-r--r-- | AndroidManifest.xml | 18 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiSetupActivity.java | 23 |
2 files changed, 37 insertions, 4 deletions
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" diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java new file mode 100644 index 0000000..8415954 --- /dev/null +++ b/src/com/android/settings/wifi/WifiSetupActivity.java @@ -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 { + +}
\ No newline at end of file |