Merge "Migrate mobile settings to SwitchPreferenceCompat" into main (a0abccad) · Commits · e / os / android_packages_apps_Settings

res/values/themes.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,7 @@

		<style name="Theme.Panel.Material" parent="Theme.Panel">
		<item name="android:switchStyle">@style/Switch.SettingsLib</item>
		<item name="switchStyle">@style/SwitchCompat.SettingsLib</item>

		<item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
		<item name="notification_importance_button_border_color_unselected">@android:color/system_outline_variant_light</item>

res/values/themes_suw.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -259,6 +259,7 @@
		<item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
		<item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
		<item name="android:switchStyle">@style/Switch.SettingsLib</item>
		<item name="switchStyle">@style/SwitchCompat.SettingsLib</item>
		<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
		</style>

res/xml/mobile_network_settings.xml

+12 −12

Original line number	Diff line number	Diff line
		@@ -54,14 +54,14 @@
		settings:allowDividerAbove="true"
		settings:allowDividerBelow="false"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="mobile_data_enable"
		android:title="@string/mobile_data_settings_title"
		android:summary="@string/mobile_data_settings_summary"
		settings:controller="com.android.settings.network.telephony.MobileDataPreferenceController"
		settings:allowDividerAbove="true"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="auto_data_switch"
		android:title="@string/auto_data_switch_title"
		android:summary="@string/auto_data_switch_summary"
		@@ -86,7 +86,7 @@
		android:title="@string/billing_cycle"
		settings:controller="com.android.settings.datausage.BillingCyclePreferenceController"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="carrier_wifi_toggle"
		android:title="@string/carrier_wifi_offload_title"
		android:summary="@string/carrier_wifi_offload_summary"
		@@ -98,13 +98,13 @@
		android:selectable="false"
		settings:searchable="false"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="mms_message"
		android:title="@string/mms_message_title"
		android:summary="@string/mms_message_summary"
		settings:controller="com.android.settings.network.telephony.MmsMessagePreferenceController"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="enhanced_4g_lte"
		android:title="@string/enhanced_4g_lte_mode_title"
		android:persistent="false"
		@@ -112,7 +112,7 @@
		settings:keywords="@string/keywords_enhance_4g_lte"
		settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="4g_calling"
		android:title="@string/enhanced_4g_lte_mode_title_4g_calling"
		android:persistent="false"
		@@ -120,7 +120,7 @@
		settings:keywords="@string/keywords_enhance_4g_lte"
		settings:controller="com.android.settings.network.telephony.Enhanced4gCallingPreferenceController"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="advance_call"
		android:title="@string/enhanced_4g_lte_mode_title_advanced_calling"
		android:persistent="false"
		@@ -128,7 +128,7 @@
		settings:keywords="@string/keywords_enhance_4g_lte"
		settings:controller="com.android.settings.network.telephony.Enhanced4gAdvancedCallingPreferenceController"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="contact_discovery_opt_in"
		android:title="@string/contact_discovery_opt_in_title"
		android:persistent="false"
		@@ -179,7 +179,7 @@
		</intent>
		</Preference>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="video_calling_key"
		android:title="@string/video_calling_settings_title"
		android:persistent="true"
		@@ -210,7 +210,7 @@
		android:title="@string/network_operator_category"
		settings:controller="com.android.settings.network.telephony.NetworkPreferenceCategoryController">

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="auto_select_key"
		android:title="@string/select_automatically"
		settings:controller="com.android.settings.network.telephony.gsm.AutoSelectPreferenceController"/>
		@@ -244,14 +244,14 @@
		settings:useAdminDisabledSummary="true"
		settings:userRestriction="no_cellular_2g"/>

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="require_cellular_encryption"
		android:title="@string/require_cellular_encryption_title"
		android:summary="@string/require_cellular_encryption_summary"
		settings:controller=
		"com.android.settings.network.telephony.NullAlgorithmsPreferenceController" />

		<SwitchPreference
		<SwitchPreferenceCompat
		android:key="nr_advanced_calling"
		android:title="@string/nr_advanced_calling_title"
		android:persistent="false"

src/com/android/settings/core/PreferenceXmlParserUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public class PreferenceXmlParserUtils {
		private static final String TAG = "PreferenceXmlParserUtil";
		public static final String PREF_SCREEN_TAG = "PreferenceScreen";
		private static final List<String> SUPPORTED_PREF_TYPES = Arrays.asList(
		"Preference", "PreferenceCategory", "PreferenceScreen",
		"Preference", "PreferenceCategory", "PreferenceScreen", "SwitchPreferenceCompat",
		"com.android.settings.widget.WorkOnlyCategory");
		public static final int PREPEND_VALUE = 0;
		public static final int APPEND_VALUE = 1;