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

Commit 99956449 authored by Yuhan Yang's avatar Yuhan Yang Committed by Android (Google) Code Review
Browse files

Merge "Add mouse scrolling category title" into main

parents cbecb7e5 ba7738cb

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4741,6 +4741,8 @@ 
    <!-- Summary text for the 'Mouse reverse scrolling' preference switch indicating to users that when the setting is enabled that scrolling up with their mouse wheel will move the page content down. [CHAR LIMIT=NONE] -->

    <string name="mouse_reverse_vertical_scrolling_summary">Content moves up when you scroll down</string>

    <!-- TODO(b/383555305): finalize these strings and mark them translatable. -->

    <!-- Title for the scrolling section of the mouse settings page. [CHAR LIMIT=60] -->

    <string name="mouse_scrolling_category_title" translatable="false">Scrolling</string>

    <!-- Title for the 'Mouse controlled scrolling' preference switch, which disables the mouse scrolling acceleration so that the scrolling speed becomes directly proportional to the speed at which the wheel is turned. [CHAR LIMIT=60]-->

    <string name="mouse_scrolling_acceleration" translatable="false">Controlled scrolling</string>

    <!-- Title for the 'Scrolling speed' slider seekbar, which controls how fast content scrolls when the user moves the scroll wheel. [CHAR LIMIT=60]-->

res/xml/mouse_settings.xml

+35 −30
Original line number Diff line number Diff line
@@ -20,37 +20,27 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/mouse_settings">



    <SwitchPreferenceCompat

        android:key="mouse_swap_primary_button"

        android:title="@string/mouse_swap_primary_button"

        android:summary="@string/mouse_swap_primary_button_summary"

        settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" />



    <SwitchPreferenceCompat

        android:key="mouse_reverse_vertical_scrolling"

        android:title="@string/mouse_reverse_vertical_scrolling"

        android:summary="@string/mouse_reverse_vertical_scrolling_summary"

        settings:controller="com.android.settings.inputmethod.MouseReverseVerticalScrollingPreferenceController" />



    <SwitchPreferenceCompat

        android:key="mouse_swap_primary_button"

        android:title="@string/mouse_swap_primary_button"

        android:summary="@string/mouse_swap_primary_button_summary"

        settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" />



    <SwitchPreferenceCompat

        android:key="mouse_pointer_acceleration"

        android:title="@string/mouse_pointer_acceleration"

        android:summary="@string/mouse_pointer_acceleration_summary"

        android:order="10"

        settings:controller="com.android.settings.inputmethod.MousePointerAccelerationPreferenceController" />



    <com.android.settings.widget.SeekBarPreference

        android:key="trackpad_pointer_speed"

        android:title="@string/trackpad_pointer_speed"

        android:order="40"

        android:order="20"

        android:selectable="false"

        settings:controller="com.android.settings.inputmethod.TouchpadPointerSpeedPreferenceController"/>



    <SwitchPreferenceCompat

        android:key="mouse_swap_primary_button"

        android:title="@string/mouse_swap_primary_button"

        android:summary="@string/mouse_swap_primary_button_summary"

        android:order="30"

        settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" />



    <Preference

        android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"

        android:key="accessibility_pointer_and_touchpad"
@@ -60,10 +50,23 @@ 
        android:summary="@string/accessibility_pointer_and_touchpad_summary"

        settings:searchable="true"/>



    <PreferenceCategory

        android:key="pointer_category"

        android:persistent="false"

        android:order="51"

        android:title="@string/mouse_scrolling_category_title">



        <SwitchPreferenceCompat

            android:key="mouse_reverse_vertical_scrolling"

            android:order="52"

            android:title="@string/mouse_reverse_vertical_scrolling"

            android:summary="@string/mouse_reverse_vertical_scrolling_summary"

            settings:controller="com.android.settings.inputmethod.MouseReverseVerticalScrollingPreferenceController" />



        <SwitchPreferenceCompat

            android:order="55"

            android:key="mouse_scrolling_acceleration"

            android:title="@string/mouse_scrolling_acceleration"

        android:order="55"

            settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController" />



        <com.android.settings.widget.SeekBarPreference
@@ -73,4 +76,6 @@ 
            android:selectable="false"

            settings:controller="com.android.settings.inputmethod.MouseScrollingSpeedPreferenceController"/>



    </PreferenceCategory>



</PreferenceScreen>