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

Commit 26208220 authored by Doris Ling's avatar Doris Ling
Browse files

Remove WirelessSettings and related code not used in new IA. 

- remove WirelessSettingsActivity and update other references to it.
- move the intent filter android.settings.WIRELESS_SETTINGS and
  android.settings.AIRPLANE_MODE_SETTINGS into Network dashboard
- move intent filter android.settings.NFC_SETTINGS into Connected
  devices dashboard.

Change-Id: I84f75ac45d0712eac9c40aa6c8f052bc060ed03a
Fix: 32342061
Test: make RunSettingsRoboTests
parent 430c8d37

AndroidManifest.xml

+40 −44
Original line number Original line Diff line number Diff line
@@ -176,15 +176,14 @@ 




        <!-- Wireless Controls -->

        <!-- Wireless Controls -->





        <activity android:name="Settings$WirelessSettingsActivity"

        <activity android:name=".Settings$NetworkDashboardActivity"

            android:taskAffinity="com.android.settings"

            android:taskAffinity="com.android.settings"

                android:label="@string/wireless_networks_settings_title"

            android:label="@string/network_dashboard_title"

                android:icon="@drawable/ic_settings_more"

            android:icon="@drawable/ic_dashboard_network"

            android:parentActivityName="Settings">

            android:parentActivityName="Settings">

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

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

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

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

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

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

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

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

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

            </intent-filter>

            </intent-filter>

            <intent-filter>

            <intent-filter>
@@ -192,16 +191,42 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

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

            </intent-filter>

            </intent-filter>

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

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

                <action android:name="com.android.settings.action.SETTINGS"/>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            </intent-filter>

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

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

                android:value="com.android.settings.category.wireless" />

                android:value="com.android.settings.category.ia.homepage"/>

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

                android:resource="@string/radio_controls_title" />

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

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

                android:value="com.android.settings.WirelessSettings" />

                android:value="com.android.settings.network.NetworkDashboardFragment"/>

            <!-- Note that this doesn't really show any Wireless settings. -->

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

                android:value="@string/network_dashboard_summary"/>

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

                android:value="true" />

        </activity>



        <activity android:name=".Settings$ConnectedDeviceDashboardActivity"

            android:taskAffinity="com.android.settings"

            android:label="@string/connected_devices_dashboard_title"

            android:icon="@drawable/ic_devices_other"

            android:parentActivityName="Settings">

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

                <action android:name="android.settings.NFC_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.DEFAULT" />

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

            </intent-filter>

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

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

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

                android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>

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

                android:value="com.android.settings.category.ia.homepage"/>

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

                android:value="@string/connected_devices_dashboard_summary"/>

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

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

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -384,7 +409,7 @@ 
                android:launchMode="singleTask"

                android:launchMode="singleTask"

                android:taskAffinity="com.android.settings"

                android:taskAffinity="com.android.settings"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:parentActivityName="Settings$WirelessSettingsActivity"

                android:parentActivityName="Settings$NetworkDashboardActivity"

                android:process="com.android.phone">

                android:process="com.android.phone">

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

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

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

                <action android:name="android.settings.APN_SETTINGS" />
@@ -2091,7 +2116,7 @@ 
        <activity android:name="Settings$AndroidBeamSettingsActivity"

        <activity android:name="Settings$AndroidBeamSettingsActivity"

                android:label="@string/android_beam_settings_title"

                android:label="@string/android_beam_settings_title"

                android:taskAffinity="com.android.settings"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$WirelessSettingsActivity">

                android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">

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

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

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

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

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -2962,35 +2987,6 @@ 
        <!-- Information architecture host activities -->

        <!-- Information architecture host activities -->





        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->

        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->

        <activity android:name=".Settings$NetworkDashboardActivity"

                  android:taskAffinity=""

                  android:label="@string/network_dashboard_title"

                  android:icon="@drawable/ic_dashboard_network">

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

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

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

                       android:value="com.android.settings.category.ia.homepage"/>

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

                       android:value="com.android.settings.network.NetworkDashboardFragment"/>

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

                       android:value="@string/network_dashboard_summary"/>

        </activity>



        <activity android:name=".Settings$ConnectedDeviceDashboardActivity"

                  android:label="@string/connected_devices_dashboard_title"

                  android:icon="@drawable/ic_devices_other">

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

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

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

                       android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>

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

                       android:value="com.android.settings.category.ia.homepage"/>

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

                       android:value="@string/connected_devices_dashboard_summary"/>

        </activity>



        <activity android:name=".Settings$AppAndNotificationDashboardActivity"

        <activity android:name=".Settings$AppAndNotificationDashboardActivity"

                  android:label="@string/app_and_notification_dashboard_title"

                  android:label="@string/app_and_notification_dashboard_title"

                  android:icon="@drawable/ic_dashboard_apps">

                  android:icon="@drawable/ic_dashboard_apps">

res/drawable/ic_settings_more.xml

deleted100644 → 0
+0 −25
Original line number Original line Diff line number Diff line 
<!--

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

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="18.0"

        android:viewportHeight="18.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>

</vector>

res/xml/wireless_settings.xml

deleted100644 → 0
+0 −101
Original line number Original line 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"

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

        android:title="@string/radio_controls_title">



    <SwitchPreference

        android:key="toggle_airplane"

        android:title="@string/airplane_mode"

        android:disableDependentsState="true" />



    <SwitchPreference

        android:key="toggle_nfc"

        android:title="@string/nfc_quick_toggle_title"

        android:summary="@string/nfc_quick_toggle_summary" />



    <PreferenceScreen

        android:key="wifi_calling_settings"

        android:title="@string/wifi_calling_settings_title"

        settings:keywords="@string/keywords_wifi_calling"

        android:fragment="com.android.settings.WifiCallingSettings" />



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.nfc.AndroidBeam"

        android:key="android_beam_settings"

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



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.TetherSettings"

        android:key="tether_settings"

        android:title="@string/tether_settings_title_all"

        settings:userRestriction="no_config_tethering"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.vpn2.VpnSettings"

        android:key="vpn_settings"

        android:title="@string/vpn_settings_title"

        settings:userRestriction="no_config_vpn"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

        android:key="mobile_network_settings"

        android:title="@string/network_settings_title"

        settings:keywords="@string/keywords_more_mobile_networks"

        settings:userRestriction="no_config_mobile_networks"

        settings:useAdminDisabledSummary="true"

        android:dependency="toggle_airplane">

        <intent

            android:action="android.intent.action.MAIN"

            android:targetPackage="com.android.phone"

            android:targetClass="com.android.phone.MobileNetworkSettings" />

    </com.android.settingslib.RestrictedPreference>



    <com.android.settingslib.RestrictedPreference

        android:key="manage_mobile_plan"

        android:title="@string/manage_mobile_plan_title"

        android:persistent="false"

        settings:userRestriction="no_config_mobile_networks"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

        android:key="wimax_settings"

        android:title="@string/wimax_settings"

        settings:userRestriction="no_config_mobile_networks"

        settings:useAdminDisabledSummary="true">

        <intent

            android:action="android.intent.action.MAIN"

            android:targetPackage="com.android.settings.wimax"

            android:targetClass="com.android.settings.wimax.WimaxSettings" />

    </com.android.settingslib.RestrictedPreference>



    <PreferenceScreen

        android:fragment="com.android.settings.ProxySelector"

        android:key="proxy_settings"

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



    <!-- Network reset -->

    <com.android.settingslib.RestrictedPreference

        android:key="network_reset"

        android:title="@string/reset_network_title"

        settings:keywords="@string/keywords_network_reset"

        settings:userRestriction="no_network_reset"

        settings:useAdminDisabledSummary="true"

        android:fragment="com.android.settings.ResetNetwork" />



</PreferenceScreen>

src/com/android/settings/Settings.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ public class Settings extends SettingsActivity { 
    * Settings subclasses for launching independently.

    * Settings subclasses for launching independently.

    */

    */

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

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

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

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

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

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

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

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

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

src/com/android/settings/SettingsActivity.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -920,7 +920,11 @@ public class SettingsActivity extends SettingsDrawerActivity 
                && !Utils.isMonkeyRunning(), isAdmin);

                && !Utils.isMonkeyRunning(), isAdmin);





        setTileEnabled(new ComponentName(packageName,

        setTileEnabled(new ComponentName(packageName,

                        Settings.WirelessSettingsActivity.class.getName()),

                Settings.NetworkDashboardActivity.class.getName()),

                !UserManager.isDeviceInDemoMode(this), isAdmin);



        setTileEnabled(new ComponentName(packageName,

                Settings.ConnectedDeviceDashboardActivity.class.getName()),

                !UserManager.isDeviceInDemoMode(this), isAdmin);

                !UserManager.isDeviceInDemoMode(this), isAdmin);





        setTileEnabled(new ComponentName(packageName,

        setTileEnabled(new ComponentName(packageName,