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

Commit 9d2712cd authored by Stephen Chen's avatar Stephen Chen
Browse files

Move AdvancedWifiSettings into ConfigureWifiSettings. 

Bug:34719854
Test: make -j40 RunSettingsRoboTests
clicked on preferences and made sure functionality did not change.

Change-Id: Ia5f0c7f5ea0f88d1322008ab58ca79028cc1a2bb
parent 5d1506a2

AndroidManifest.xml

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

        </activity>



        <activity android:name="Settings$AdvancedWifiSettingsActivity"

                android:taskAffinity="com.android.settings"

                android:label="@string/wifi_advanced_settings_label"

                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.WIFI_IP_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.AdvancedWifiSettings" />

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$SavedAccessPointsSettingsActivity"

                android:taskAffinity="com.android.settings"

                android:label="@string/wifi_saved_access_points_label"

res/xml/wifi_advanced_settings.xml

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 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.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/wifi_advanced_titlebar">



    <Preference

            android:key="install_credentials"

            android:title="@string/wifi_install_credentials"

            android:persistent="false" />



    <Preference

            android:key="wifi_direct"

            android:title="@string/wifi_menu_p2p"

            android:persistent="false" />



    <Preference

            android:key="wps_push_button"

            android:title="@string/wifi_menu_wps_pbc"

            android:persistent="false" />



    <Preference

            android:key="wps_pin_entry"

            android:title="@string/wifi_menu_wps_pin"

            android:persistent="false" />



</PreferenceScreen>

res/xml/wifi_configure_settings.xml

+25 −0
Original line number Diff line number Diff line
@@ -52,4 +52,29 @@ 
        android:key="current_ip_address"

        android:title="@string/wifi_advanced_ip_address_title"/>



    <Preference

            android:key="install_credentials"

            android:title="@string/wifi_install_credentials">

        <intent android:action="android.credentials.INSTALL_AS_USER"

                android:targetPackage="com.android.certinstaller"

                android:targetClass="com.android.certinstaller.CertInstallerMain">

            <extra android:name="install_as_uid" android:value="1010"/>

        </intent>

    </Preference>



    <Preference

            android:key="wifi_direct"

            android:title="@string/wifi_menu_p2p">

        <intent android:targetPackage="com.android.settings"

                android:targetClass="com.android.settings.Settings$WifiP2pSettingsActivity"/>

    </Preference>



    <Preference

            android:key="wps_push_button"

            android:title="@string/wifi_menu_wps_pbc" />



    <Preference

            android:key="wps_pin_entry"

            android:title="@string/wifi_menu_wps_pin" />



</PreferenceScreen>

src/com/android/settings/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ public class Settings extends SettingsActivity { 
    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 */ }

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

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

+0 −2
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ import com.android.settings.tts.TextToSpeechSettings; 
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;
@@ -140,7 +139,6 @@ public class SettingsGateway { 
            WirelessSettings.class.getName(),

            WifiSettings.class.getName(),

            ConfigureWifiSettings.class.getName(),

            AdvancedWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings.class.getName(),

            BluetoothSettings.class.getName(),

            SimSettings.class.getName(),