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

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

Add connected devices dashboard category for new IA. 

Add the initial version for the connected devices category.

Test: RunSettingsRoboTests
Bug: 31800290

Change-Id: Ibacef7d5ceaae5e71ff5e5b1c35dafa7738e4f75
parent c4f07e2d

AndroidManifest.xml

+45 −0
Original line number Diff line number Diff line
@@ -3219,6 +3219,51 @@ 
                       android:value="true" />

        </activity-alias>



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

                  android:label="@string/connected_devices_dashboard_title"

                  android:icon="@drawable/ic_bt_laptop">

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

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

        </activity>



        <activity-alias android:name="BluetoothDashboardAlias"

                        android:targetActivity="Settings$BluetoothSettingsActivity">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.bluetooth.BluetoothSettings" />

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

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

        </activity-alias>



        <activity-alias android:name="CastDashboardAlias"

                        android:targetActivity="Settings$WifiDisplaySettingsActivity">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.wfd.WifiDisplaySettings" />

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

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

        </activity-alias>



        <activity-alias android:name="PrintDashboardAlias"

                        android:targetActivity="Settings$PrintSettingsActivity">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.print.PrintSettingsFragment" />

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

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

        </activity-alias>



        <!-- End of information architecture host activities -->



        <service

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5917,6 +5917,8 @@ 














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















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













    <!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->













    <string name="connected_devices_dashboard_title">Connected devices</string>





























    <!-- Search strings -->















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

































res/xml/connected_devices.xml
0 → 100644



+31
−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">



























  <SwitchPreference













    android:key="toggle_nfc"













    android:title="@string/nfc_quick_toggle_title"













    android:summary="@string/nfc_quick_toggle_summary"













    android:order="-5" />



























  <com.android.settingslib.RestrictedPreference













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













    android:key="android_beam_settings"













    android:title="@string/android_beam_settings_title"













    android:order="-4" />



























</PreferenceScreen>










 No newline at end of file
























src/com/android/settings/Settings.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -165,6 +165,7 @@ public class Settings extends SettingsActivity {





























    // Top level categories for new IA















    public static class NetworkDashboardActivity extends SettingsActivity {}













    public static class ConnectedDeviceDashboardActivity 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



+4
−0




























Original line number
Diff line number
Diff line








@@ -74,6 +74,7 @@ import com.android.settings.applications.UsageAccessDetails;













import com.android.settings.applications.VrListenerSettings;















import com.android.settings.applications.WriteSettingsDetails;















import com.android.settings.bluetooth.BluetoothSettings;













import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;















import com.android.settings.core.instrumentation.SharedPreferencesLogger;















import com.android.settings.dashboard.DashboardContainerFragment;















import com.android.settings.dashboard.DashboardFeatureProvider;










@@ -279,6 +280,8 @@ public class SettingsActivity extends SettingsDrawerActivity













            // Home page > Network & Internet















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















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













            // Home page > Connected devices













            Settings.ConnectedDeviceDashboardActivity.class.getName(),















            // Home page > System















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















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










@@ -388,6 +391,7 @@ public class SettingsActivity extends SettingsDrawerActivity













            StorageDashboardFragment.class.getName(),















            SystemDashboardFragment.class.getName(),















            NetworkDashboardFragment.class.getName(),













            ConnectedDeviceDashboardFragment.class.getName(),















    };