e92e07eb97
The new UX for showing multiple active mobile plan subscriptions (SIMs, eSIMs, etc.) needs a header at the top of the Network & internet page that shows wifi status and a list of active mobile subscriptions in the form of one Preference per subscription. This CL adds display of the mobile subscriptions to this header. It does not yet show the correct summary text or do anything when you tap on them - that will be coming in subsequent CLs. Also, since adding a variable number of items to the top of the page messes up our current strategy of having a fixed number of hidden items at the bottom based on overall item count, this CL just makes all items visible. Subsequent CLs can restore this behavior with dynamic adjustment. Bug: 116349402 Test: make RunSettingsRoboTests Change-Id: Ibfadf8cb61f6f5aff6ce38b7974267b1e4ddc719
102 lines
4.3 KiB
XML
102 lines
4.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2018 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-auto"
|
|
android:key="network_and_internet_screen"
|
|
android:title="@string/network_dashboard_title">
|
|
|
|
<PreferenceCategory
|
|
android:key="multi_network_header"
|
|
settings:allowDividerBelow="true"
|
|
android:order="-40"
|
|
settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
|
|
|
|
<com.android.settings.widget.MasterSwitchPreference
|
|
android:fragment="com.android.settings.wifi.WifiSettings"
|
|
android:key="toggle_wifi"
|
|
android:title="@string/wifi_settings"
|
|
android:summary="@string/summary_placeholder"
|
|
android:icon="@drawable/ic_settings_wireless"
|
|
android:order="-30"
|
|
settings:allowDividerAbove="true">
|
|
<intent
|
|
android:action="android.settings.WIFI_SETTINGS"
|
|
android:targetClass="Settings$WifiSettingsActivity" />
|
|
</com.android.settings.widget.MasterSwitchPreference>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="mobile_network_settings"
|
|
android:title="@string/network_settings_title"
|
|
android:summary="@string/summary_placeholder"
|
|
android:icon="@drawable/ic_network_cell"
|
|
android:order="-15"
|
|
settings:keywords="@string/keywords_more_mobile_networks"
|
|
settings:userRestriction="no_config_mobile_networks"
|
|
settings:useAdminDisabledSummary="true">
|
|
</com.android.settingslib.RestrictedPreference>
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="toggle_airplane"
|
|
android:title="@string/airplane_mode"
|
|
android:icon="@drawable/ic_airplanemode_active"
|
|
android:disableDependentsState="true"
|
|
android:order="-5"
|
|
settings:controller="com.android.settings.network.AirplaneModePreferenceController"
|
|
settings:platform_slice="true"
|
|
settings:userRestriction="no_airplane_mode"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="manage_mobile_plan"
|
|
android:title="@string/manage_mobile_plan_title"
|
|
android:persistent="false"
|
|
android:order="0"
|
|
settings:userRestriction="no_config_mobile_networks"
|
|
settings:useAdminDisabledSummary="true" />
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:fragment="com.android.settings.TetherSettings"
|
|
android:key="tether_settings"
|
|
android:title="@string/tether_settings_title_all"
|
|
android:icon="@drawable/ic_wifi_tethering"
|
|
android:order="5"
|
|
android:summary="@string/summary_placeholder"
|
|
settings:keywords="@string/keywords_hotspot_tethering"
|
|
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:icon="@drawable/ic_vpn_key"
|
|
android:order="10"
|
|
android:summary="@string/summary_placeholder"
|
|
settings:userRestriction="no_config_vpn"
|
|
settings:useAdminDisabledSummary="true" />
|
|
|
|
<com.android.settings.network.PrivateDnsModeDialogPreference
|
|
android:key="private_dns_settings"
|
|
android:title="@string/select_private_dns_configuration_title"
|
|
android:order="15"
|
|
android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
|
|
android:dialogLayout="@layout/private_dns_mode_dialog"
|
|
android:positiveButtonText="@string/save"
|
|
android:negativeButtonText="@android:string/cancel" />
|
|
|
|
</PreferenceScreen>
|