Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev

        </activity-alias>

        <activity android:name=".wifi.WifiPickerActivity"

                  android:label="@string/wifi_setup_wizard_title"

                android:parentActivityName="Settings"

                android:clearTaskOnLaunch="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />

                <category android:name="android.intent.category.DEFAULT" />

            </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="android.net.wifi.PICK_WIFI_NETWORK" />

                <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

/*

 * 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