Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08853706 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add activity action for Configure Wi-Fi settings."

parents 94b86a4d 3aa547b5

AndroidManifest.xml

+21 −0
Original line number Diff line number Diff line
@@ -277,6 +277,27 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$ConfigureWifiSettingsActivity"

                android:taskAffinity="com.android.settings"

                android:label="@string/wifi_configure_titlebar"

                android:icon="@drawable/ic_settings_wireless"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:parentActivityName="Settings$WifiSettingsActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.CONFIGURE_WIFI_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

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

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

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

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.wifi.ConfigureWifiSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity android:name="Settings$AdvancedWifiSettingsActivity"

                android:taskAffinity="com.android.settings"

                android:label="@string/wifi_advanced_settings_label"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public class Settings extends SettingsActivity { 
    public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class ConfigureWifiSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AdvancedWifiSettingsActivity extends SettingsActivity { /* empty */ }

    public static class SavedAccessPointsSettingsActivity extends SettingsActivity { /* empty */ }

    public static class TextToSpeechSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ import com.android.settings.users.UserSettings; 
import com.android.settings.vpn2.VpnSettings;

import com.android.settings.wfd.WifiDisplaySettings;

import com.android.settings.wifi.AdvancedWifiSettings;

import com.android.settings.wifi.ConfigureWifiSettings;

import com.android.settings.wifi.SavedAccessPointsWifiSettings;

import com.android.settings.wifi.WifiAPITest;

import com.android.settings.wifi.WifiInfo;
@@ -136,6 +137,7 @@ public class SettingsGateway { 
    public static final String[] ENTRY_FRAGMENTS = {

            WirelessSettings.class.getName(),

            WifiSettings.class.getName(),

            ConfigureWifiSettings.class.getName(),

            AdvancedWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings.class.getName(),

            BluetoothSettings.class.getName(),

src/com/android/settings/search/Ranking.java

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.settings.sim.SimSettings; 
import com.android.settings.system.SystemDashboardFragment;

import com.android.settings.users.UserSettings;

import com.android.settings.wifi.AdvancedWifiSettings;

import com.android.settings.wifi.ConfigureWifiSettings;

import com.android.settings.wifi.SavedAccessPointsWifiSettings;

import com.android.settings.wifi.WifiSettings;
@@ -104,6 +105,7 @@ public final class Ranking { 
    static {

        // Wi-Fi

        sRankMap.put(WifiSettings.class.getName(), RANK_WIFI);

        sRankMap.put(ConfigureWifiSettings.class.getName(), RANK_WIFI);

        sRankMap.put(AdvancedWifiSettings.class.getName(), RANK_WIFI);

        sRankMap.put(SavedAccessPointsWifiSettings.class.getName(), RANK_WIFI);

src/com/android/settings/search/SearchIndexableResources.java

+5 −4
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import com.android.settings.sim.SimSettings; 
import com.android.settings.system.SystemDashboardFragment;

import com.android.settings.users.UserSettings;

import com.android.settings.wifi.AdvancedWifiSettings;

import com.android.settings.wifi.ConfigureWifiSettings;

import com.android.settings.wifi.SavedAccessPointsWifiSettings;

import com.android.settings.wifi.WifiSettings;
@@ -97,10 +98,10 @@ public final class SearchIndexableResources { 
    static {

        addIndex(WifiSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless);

        addIndex(NetworkDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless);

        addIndex(AdvancedWifiSettings.class,

                R.xml.wifi_advanced_settings, R.drawable.ic_settings_wireless);

        addIndex(SavedAccessPointsWifiSettings.class,

                R.xml.wifi_display_saved_access_points, R.drawable.ic_settings_wireless);

        addIndex(AdvancedWifiSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless);

        addIndex(ConfigureWifiSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless);

        addIndex(SavedAccessPointsWifiSettings.class, NO_DATA_RES_ID,

                R.drawable.ic_settings_wireless);

        addIndex(BluetoothSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth);

        addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd);

        addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);