Rename RadioButtonPreference -> SelectorWithWidgetPreference.

This change is to reduce ambiguity as we're adding the option to style the preference like a checkbox as well.

Bug: 190180868
Test: SelectorWithWidgetPreferenceTest, RunSettingsLibRoboTests
Change-Id: Ie414347bf67ed394ef495604890c5851fc42dbc7
This commit is contained in:
Yuri Lin
2021-07-20 11:42:39 -04:00
parent a113fdb727
commit e9f13fbd5e
65 changed files with 311 additions and 305 deletions

View File

@@ -27,27 +27,27 @@
settings:searchable="false"
settings:lottie_rawRes="@drawable/accessibility_dwell" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_autoclick_default"
android:title="@string/accessibility_autoclick_default_title"
settings:allowDividerAbove="true" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_autoclick_200ms"
android:title="@string/accessibility_autoclick_short_title"
android:summary="@string/accessibility_autoclick_short_summary" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_autoclick_600ms"
android:title="@string/accessibility_autoclick_medium_title"
android:summary="@string/accessibility_autoclick_medium_summary" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_autoclick_1sec"
android:title="@string/accessibility_autoclick_long_title"
android:summary="@string/accessibility_autoclick_long_summary" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_autoclick_custom"
android:title="@string/accessibility_autoclick_custom_title" />

View File

@@ -25,28 +25,28 @@
android:key="accessibility_control_timeout_banner"
settings:lottie_rawRes="@raw/accessibility_timeout_banner"/>
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_default"
android:title="@string/accessibility_timeout_default"
settings:allowDividerAbove="true"
android:persistent="false" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_10secs"
android:title="@string/accessibility_timeout_10secs"
android:persistent="false" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_30secs"
android:title="@string/accessibility_timeout_30secs"
android:persistent="false" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_1min"
android:title="@string/accessibility_timeout_1min"
android:persistent="false" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="accessibility_control_timeout_2mins"
android:title="@string/accessibility_timeout_2mins"
android:persistent="false" />

View File

@@ -32,24 +32,24 @@
android:title="@string/daltonizer_type"
android:key="daltonizer_mode_category" >
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_deuteranomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_deuteranomaly_summary"
android:title="@string/daltonizer_mode_deuteranomaly_title" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_protanomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_protanomaly_summary"
android:title="@string/daltonizer_mode_protanomaly_title" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_tritanomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_tritanomaly_summary"
android:title="@string/daltonizer_mode_tritanomaly_title" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_grayscale"
android:persistent="false"
android:title="@string/daltonizer_mode_grayscale_title" />

View File

@@ -17,16 +17,16 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/notification_importance_title">
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="importance_high"
android:title="@string/notification_importance_high" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="importance_default"
android:title="@string/notification_importance_default" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="importance_low"
android:title="@string/notification_importance_low" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="importance_min"
android:title="@string/notification_importance_min" />

View File

@@ -42,13 +42,13 @@
android:title="@string/one_handed_mode_swipe_down_category"
settings:controller="com.android.settings.gestures.OneHandedPreferenceCategoryController">
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="gesture_one_handed_action_pull_screen_down"
android:title="@string/one_handed_action_pull_down_screen_title"
android:summary="@string/one_handed_action_pull_down_screen_summary"
settings:controller="com.android.settings.gestures.OneHandedActionPullDownPrefController"/>
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="gesture_one_handed_action_show_notification"
android:title="@string/one_handed_action_show_notification_title"
android:summary="@string/one_handed_action_show_notification_summary"

View File

@@ -30,19 +30,19 @@
<PreferenceCategory
android:title="@string/battery_detail_manage_title">
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="unrestricted_pref"
android:summary="@string/manager_battery_usage_unrestricted_summary"
android:title="@string/manager_battery_usage_unrestricted_title"
settings:controller="com.android.settings.fuelgauge.UnrestrictedPreferenceController"/>
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="optimized_pref"
android:summary="@string/manager_battery_usage_optimized_summary"
android:title="@string/manager_battery_usage_optimized_title"
settings:controller="com.android.settings.fuelgauge.OptimizedPreferenceController"/>
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="restricted_pref"
android:summary="@string/manager_battery_usage_restricted_summary"
android:title="@string/manager_battery_usage_restricted_title"

View File

@@ -22,11 +22,11 @@
<PreferenceCategory
android:key="zen_custom_rule_category">
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_custom_rule_setting_default"
android:title="@string/zen_mode_custom_behavior_summary_default"/>
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_custom_rule_setting"
android:title="@string/zen_mode_custom_behavior_summary" />
</PreferenceCategory>

View File

@@ -23,19 +23,19 @@
<PreferenceCategory
android:key="restrict_category"
android:title="@string/zen_mode_restrict_notifications_category">
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_mute_notifications"
android:title="@string/zen_mode_restrict_notifications_mute"
android:summary="@string/zen_mode_restrict_notifications_mute_summary"
settings:searchable="false"/>
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_hide_notifications"
android:title="@string/zen_mode_restrict_notifications_hide"
android:summary="@string/zen_mode_restrict_notifications_hide_summary"
settings:searchable="false"/>
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_custom"
android:title="@string/zen_mode_restrict_notifications_custom"
settings:searchable="false"/>