From ba7738cba034e1cfc8a83eb0c7e08aebb1ff3719 Mon Sep 17 00:00:00 2001
From: Yuhan Yang <yyhyyh@google.com>
Date: Wed, 5 Feb 2025 10:01:45 +0000
Subject: [PATCH] Add mouse scrolling category title

Add a scrolling category title in mouse settings page to match
the new design.

Mock: go/al-peripherals-ux page 3.
Screenshot: go/screenshot-8mtcgnjkabci8qt

Bug: 383555305
Bug: 384795606
Test: Local DUT with aconfig flags enabled
Flag: com.android.hardware.input.mouse_scrolling_acceleration
Change-Id: I3aa734a9e588c41dc9d48c40d779544074654a0a
---
 res/values/strings.xml     |  2 ++
 res/xml/mouse_settings.xml | 65 ++++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 483eb130658..0c6241283e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4721,6 +4721,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]-->
diff --git a/res/xml/mouse_settings.xml b/res/xml/mouse_settings.xml
index 35279ec35ed..e4b3f1c8f79 100644
--- a/res/xml/mouse_settings.xml
+++ b/res/xml/mouse_settings.xml
@@ -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,17 +50,32 @@
         android:summary="@string/accessibility_pointer_and_touchpad_summary"
         settings:searchable="true"/>
 
-    <SwitchPreferenceCompat
-        android:key="mouse_scrolling_acceleration"
-        android:title="@string/mouse_scrolling_acceleration"
-        android:order="55"
-        settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController" />
+    <PreferenceCategory
+        android:key="pointer_category"
+        android:persistent="false"
+        android:order="51"
+        android:title="@string/mouse_scrolling_category_title">
 
-    <com.android.settings.widget.SeekBarPreference
-        android:key="mouse_scrolling_speed"
-        android:title="@string/mouse_scrolling_speed"
-        android:order="60"
-        android:selectable="false"
-        settings:controller="com.android.settings.inputmethod.MouseScrollingSpeedPreferenceController"/>
+        <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"
+            settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController" />
+
+        <com.android.settings.widget.SeekBarPreference
+            android:key="mouse_scrolling_speed"
+            android:title="@string/mouse_scrolling_speed"
+            android:order="60"
+            android:selectable="false"
+            settings:controller="com.android.settings.inputmethod.MouseScrollingSpeedPreferenceController"/>
+
+    </PreferenceCategory>
 
 </PreferenceScreen>