Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17dda0fa authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference."

parents e3e33471 e9f13fbd

res/xml/accessibility_autoclick_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -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" />

res/xml/accessibility_control_timeout_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -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" />

res/xml/accessibility_daltonizer_settings.xml

+4 −4
Original line number Diff line number Diff line
@@ -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" />

res/xml/notification_importance.xml

+4 −4
Original line number Diff line number Diff line
@@ -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" />

res/xml/one_handed_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"