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

Commit bb93dc02 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add a new empty dashboard for Network & Internet. 

Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: Ide0c07839332e615f6ba86fb87a1eb04cce2fae7
parent 8358ac1a

AndroidManifest.xml

+38 −0
Original line number Diff line number Diff line
@@ -3033,6 +3033,44 @@ 
        <!-- Information architecture host activities -->



        <!-- 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_settings_wireless">

            <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"/>

        </activity>



        <activity-alias android:name="WifiDashboardAlias"

                        android:targetActivity="Settings$WifiSettingsActivity"

                        android:configChanges="orientation|keyboardHidden|screenSize">

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

                <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.wireless" />

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

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

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

                       android:value="true" />

        </activity-alias>



        <activity-alias android:name="DataUsageDashboardAlias"

                        android:targetActivity="Settings$DataUsageSummaryActivity">

            <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.wireless"/>

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

                       android:value="com.android.settings.datausage.DataUsageSummary"/>

        </activity-alias>



        <activity-alias android:name="BatteryDashboardAlias"

                        android:targetActivity="Settings$PowerUsageSummaryActivity">

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

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5915,6 +5915,8 @@ 
        <item quantity="other">Show %d hidden items</item>

    </plurals>













    <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->













    <string name="network_dashboard_title">Network &amp; Internet</string>





























    <!-- Search strings -->















    <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->

































res/xml/network_and_internet.xml
0 → 100644



+57
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- 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.













-->



























<PreferenceScreen













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













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



























    <SwitchPreference













        android:key="toggle_airplane"













        android:title="@string/airplane_mode"













        android:disableDependentsState="true"













        android:order="-30"/>



























    <com.android.settingslib.RestrictedPreference













        android:key="mobile_network_settings"













        android:title="@string/network_settings_title"













        android:dependency="toggle_airplane"













        android:order="-15"













        settings:keywords="@string/keywords_more_mobile_networks"













        settings:userRestriction="no_config_mobile_networks"













        settings:useAdminDisabledSummary="true">













        <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:fragment="com.android.settings.TetherSettings"













        android:key="tether_settings"













        android:title="@string/tether_settings_title_all"













        android:order="-5"













        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"













        android:order="0"













        settings:userRestriction="no_config_vpn"













        settings:useAdminDisabledSummary="true"/>



























</PreferenceScreen>










 No newline at end of file
























src/com/android/settings/Settings.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -164,7 +164,7 @@ public class Settings extends SettingsActivity {













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































    // Top level categories for new IA













    public static class DisplayDashboardActivity extends SettingsActivity {}













    public static class NetworkDashboardActivity extends SettingsActivity {}















    public static class StorageDashboardActivity extends SettingsActivity {}















    public static class SystemDashboardActivity extends SettingsActivity {}















    public static class SupportDashboardActivity extends SettingsActivity {}

































src/com/android/settings/SettingsActivity.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -104,6 +104,7 @@ import com.android.settings.inputmethod.SpellCheckersSettings;













import com.android.settings.inputmethod.UserDictionaryList;















import com.android.settings.localepicker.LocaleListEditor;















import com.android.settings.location.LocationSettings;













import com.android.settings.network.NetworkDashboardFragment;















import com.android.settings.nfc.AndroidBeam;















import com.android.settings.nfc.PaymentSettings;















import com.android.settings.notification.AppNotificationSettings;










@@ -270,10 +271,14 @@ public class SettingsActivity extends SettingsDrawerActivity





























            // New IA















            // Home page













            Settings.NetworkDashboardActivity.class.getName(),















            "com.android.settings.Settings.BatteryDashboardAlias",















            "com.android.settings.Settings.DisplayDashboardAlias",















            Settings.SystemDashboardActivity.class.getName(),















            Settings.SupportDashboardActivity.class.getName(),













            // Home page > Network & Internet













            "com.android.settings.Settings.WifiDashboardAlias",













            "com.android.settings.Settings.DataUsageDashboardAlias",















            // Home page > System















            "com.android.settings.Settings.LanguageAndInputDashboardAlias",















            "com.android.settings.Settings.DateTimeDashboardAlias",










@@ -382,6 +387,7 @@ public class SettingsActivity extends SettingsDrawerActivity













            SupportFragment.class.getName(),















            StorageDashboardFragment.class.getName(),















            SystemDashboardFragment.class.getName(),













            NetworkDashboardFragment.class.getName(),















    };