Merge "Add an on/off switch to the top of mobile network details page"

This commit is contained in:
TreeHugger Robot
2019-02-06 18:00:25 +00:00
committed by Android (Google) Code Review
5 changed files with 281 additions and 1 deletions

View File

@@ -10473,6 +10473,12 @@
<!-- Label on the confirmation button of a dialog that lets a user set the display name of a
mobile network subscription [CHAR LIMIT=20] -->
<string name="mobile_network_sim_name_rename">Rename</string>
<!-- Label for the on position of a switch on the mobile network details page which allows
disabling/enabling a SIM. The SIM is enabled in this state. [CHAR LIMIT=40] -->
<string name="mobile_network_use_sim_on">Use SIM</string>
<!-- Label for the off position of a switch on the mobile network details page which allows
disabling/enabling a SIM. The SIM is disabled in this state. [CHAR LIMIT=40] -->
<string name="mobile_network_use_sim_off">Off</string>
<!-- Title for preferred network type [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_title">Preferred network type</string>

View File

@@ -17,7 +17,12 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="mobile_network_pref_screen"
settings:initialExpandedChildrenCount="7">
settings:initialExpandedChildrenCount="8">
<com.android.settingslib.widget.LayoutPreference
android:key="use_sim_switch"
android:layout="@layout/styled_switch_bar"
settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>
<com.android.settings.datausage.DataUsageSummaryPreference
android:key="status_header"