From b547394a56a788e8ffee2c03bcbdfe67f731db0f Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Tue, 11 Mar 2025 08:12:04 +0000
Subject: [PATCH] [Physical Keyboard] Update seekbars

Update seekbars color and style.

Bug: 374030364
Bug: 399285693
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Test: atest
packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/

Change-Id: I251a7241b614114a5bb9d5090fcd22cb873ebc51
---
 ...ialog_keyboard_a11y_input_setting_keys.xml | 42 +++++++++++++-----
 res/values-night/colors.xml                   |  3 --
 res/values/colors.xml                         |  4 --
 res/xml/mouse_settings.xml                    | 44 ++++++++-----------
 res/xml/touchpad_settings.xml                 |  2 +-
 ...yboardAccessibilityKeysDialogFragment.java | 11 +++--
 6 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/res/layout/dialog_keyboard_a11y_input_setting_keys.xml b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
index bba1e2acff6..fe8762b6fb7 100644
--- a/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
+++ b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
@@ -122,20 +122,38 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginTop="8dp"
                         android:visibility="gone"/>
-                    <SeekBar
-                        android:id="@+id/input_setting_keys_value_custom_slider"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="36dp"
-                        android:min="1"
-                        android:max="50"
-                        android:progressBackgroundTint="@color/input_dialog_slider_progress_background"
-                        android:progressTint="@color/input_dialog_slider_progress"
-                        android:thumbTint="@color/input_dialog_slider_progress"
+                    <LinearLayout
+                        android:id="@+id/input_setting_keys_custom_seekbar_layout"
+                        android:orientation="horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginTop="8dp"
-                        android:visibility="gone"/>
+                        android:layout_gravity="center_horizontal"
+                        android:gravity="center_vertical"
+                        android:paddingEnd="36dp">
+                        <ImageView
+                            android:layout_marginTop="8dp"
+                            android:layout_width="16dp"
+                            android:layout_height="16dp"
+                            android:tint="@androidprv:color/materialColorPrimary"
+                            android:importantForAccessibility="no"
+                            android:src="@drawable/ic_remove_24dp" />
+                        <SeekBar
+                            android:id="@+id/input_setting_keys_value_custom_slider"
+                            style="@android:style/Widget.Material.SeekBar"
+                            android:min="1"
+                            android:max="50"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginTop="8dp" />
+                        <ImageView
+                            android:layout_marginTop="8dp"
+                            android:layout_width="16dp"
+                            android:layout_height="16dp"
+                            android:tint="@androidprv:color/materialColorPrimary"
+                            android:importantForAccessibility="no"
+                            android:src="@drawable/ic_add_24dp" />
+                    </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
         </RadioGroup>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 2c83a27e557..4d0f7abee5d 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -94,8 +94,5 @@
     <!-- Volume seekbar colors -->
     <color name="seekbar_thumb_tint_color">@android:color/system_accent1_100</color>
     <color name="seekbar_progress_tint_color">@android:color/system_accent1_100</color>
-
-    <!-- Keyboard a11y input dialog -->
-    <color name="input_dialog_slider_progress">@android:color/system_on_primary_container_dark</color>
 </resources>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 261cce491cd..9c9a29c79f9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -275,8 +275,4 @@
     <color name="seekbar_thumb_tint_color">@android:color/system_accent1_800</color>
     <color name="seekbar_progress_tint_color">@android:color/system_accent1_800</color>
     <color name="seekbar_progress_background_tint_color">@android:color/system_neutral2_50</color>
-
-    <!-- Keyboard a11y input dialog -->
-    <color name="input_dialog_slider_progress">@android:color/system_on_primary_dark</color>
-    <color name="input_dialog_slider_progress_background">@android:color/system_outline_light</color>
 </resources>
diff --git a/res/xml/mouse_settings.xml b/res/xml/mouse_settings.xml
index ec1c39d31d2..98026bdcad2 100644
--- a/res/xml/mouse_settings.xml
+++ b/res/xml/mouse_settings.xml
@@ -27,7 +27,7 @@
         android:order="10"
         settings:controller="com.android.settings.inputmethod.MousePointerAccelerationPreferenceController" />
 
-    <com.android.settings.widget.SeekBarPreference
+    <com.android.settings.widget.LabeledSeekBarPreference
         android:key="pointer_speed"
         android:title="@string/pointer_speed"
         android:order="20"
@@ -50,32 +50,24 @@
         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: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" />
 
-        <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>
+    <com.android.settings.widget.LabeledSeekBarPreference
+        android:key="mouse_scrolling_speed"
+        android:title="@string/mouse_scrolling_speed"
+        android:order="60"
+        android:selectable="false"
+        settings:controller="com.android.settings.inputmethod.MouseScrollingSpeedPreferenceController"/>
 
 </PreferenceScreen>
diff --git a/res/xml/touchpad_settings.xml b/res/xml/touchpad_settings.xml
index 7369d485cbb..c71790ee93a 100644
--- a/res/xml/touchpad_settings.xml
+++ b/res/xml/touchpad_settings.xml
@@ -61,7 +61,7 @@
         settings:controller="com.android.settings.inputmethod.TouchpadAccelerationPreferenceController"
         android:order="38"/>
 
-    <com.android.settings.widget.SeekBarPreference
+    <com.android.settings.widget.LabeledSeekBarPreference
         android:key="touchpad_pointer_speed"
         android:title="@string/trackpad_pointer_speed"
         android:order="40"
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java
index 97d5b24b5ef..16a24204349 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java
@@ -122,6 +122,8 @@ public abstract class KeyboardAccessibilityKeysDialogFragment extends DialogFrag
                     R.id.input_setting_keys_value_custom);
             TextView customValueTextView = accessibilityKeyDialog.findViewById(
                     R.id.input_setting_keys_value_custom_value);
+            View seekbarView = accessibilityKeyDialog.findViewById(
+                    R.id.input_setting_keys_custom_seekbar_layout);
             SeekBar customProgressBar = accessibilityKeyDialog.findViewById(
                     R.id.input_setting_keys_value_custom_slider);
             TextView titleTextView = accessibilityKeyDialog.findViewById(
@@ -147,7 +149,7 @@ public abstract class KeyboardAccessibilityKeysDialogFragment extends DialogFrag
                 customValueTextView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
                 customValueTextView.setText(
                         progressToThresholdInSecond(customProgressBar.getProgress()));
-                customProgressBar.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+                seekbarView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
                 buttonView.setChecked(isChecked);
             });
             cannedValueRadioGroup.setOnCheckedChangeListener(
@@ -174,14 +176,14 @@ public abstract class KeyboardAccessibilityKeysDialogFragment extends DialogFrag
                 // setting
                 initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton,
                         customValueTextView,
-                        customProgressBar);
+                        customProgressBar, seekbarView);
             } else if (customRadioButton.isChecked()) {
                 cannedValueRadioGroup.clearCheck();
                 customRadioButton.setChecked(true);
                 customValueTextView.setVisibility(View.VISIBLE);
                 customValueTextView.setText(
                         progressToThresholdInSecond(customProgressBar.getProgress()));
-                customProgressBar.setVisibility(View.VISIBLE);
+                seekbarView.setVisibility(View.VISIBLE);
             }
         });
 
@@ -199,7 +201,7 @@ public abstract class KeyboardAccessibilityKeysDialogFragment extends DialogFrag
 
     private void initStateBasedOnThreshold(RadioGroup cannedValueRadioGroup,
             RadioButton customRadioButton, TextView customValueTextView,
-            SeekBar customProgressBar) {
+            SeekBar customProgressBar, View seekbarView) {
         int inputSettingKeysThreshold = getInputSettingKeysValue();
         switch (inputSettingKeysThreshold) {
             case 600 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_600);
@@ -213,5 +215,6 @@ public abstract class KeyboardAccessibilityKeysDialogFragment extends DialogFrag
                 customRadioButton.setChecked(true);
             }
         }
+        seekbarView.setVisibility(customRadioButton.isChecked() ? View.VISIBLE : View.GONE);
     }
 }