Merge "Add the Data Saver preference to the Network & internet page"
This commit is contained in:
committed by
Android (Google) Code Review
commit
f2c30062d3
@@ -78,12 +78,19 @@
|
||||
settings:userRestriction="no_config_tethering"
|
||||
settings:useAdminDisabledSummary="true" />
|
||||
|
||||
<com.android.settings.datausage.DataSaverPreference
|
||||
android:key="restrict_background"
|
||||
android:title="@string/data_saver_title"
|
||||
android:icon="@drawable/ic_settings_data_usage"
|
||||
android:order="10"
|
||||
android:fragment="com.android.settings.datausage.DataSaverSummary"/>
|
||||
|
||||
<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:order="15"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:userRestriction="no_config_vpn"
|
||||
settings:useAdminDisabledSummary="true" />
|
||||
@@ -91,7 +98,7 @@
|
||||
<com.android.settings.network.PrivateDnsModeDialogPreference
|
||||
android:key="private_dns_settings"
|
||||
android:title="@string/select_private_dns_configuration_title"
|
||||
android:order="15"
|
||||
android:order="20"
|
||||
android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
|
||||
android:dialogLayout="@layout/private_dns_mode_dialog"
|
||||
android:positiveButtonText="@string/save"
|
||||
|
Reference in New Issue
Block a user