From 5daef3cfeecf419a439a3e9350f0f8600c3a05ae Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Mon, 10 Feb 2025 09:27:25 +0000
Subject: [PATCH] [Physical Keyboard] update color of Dialog

1. update color of slider in dialog to increase contrast
2. not showing device name in Mouse key page if there's only one device
   connected
Bug: 374030364
Bug: 377464791
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: I94d7859ba1dfdad7fdca2ee750a5afeb881756f4
---
 res/layout/dialog_keyboard_a11y_input_setting_keys.xml        | 3 +++
 res/values-night/colors.xml                                   | 3 +++
 res/values/colors.xml                                         | 4 ++++
 .../settings/inputmethod/MouseKeysImageListAdapter.java       | 3 +++
 .../settings/inputmethod/MouseKeysMainPageFragment.java       | 3 ++-
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/res/layout/dialog_keyboard_a11y_input_setting_keys.xml b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
index 01f247cdf66..addc3473276 100644
--- a/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
+++ b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
@@ -124,6 +124,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:progressBackgroundTint="@color/input_dialog_slider_progress_background"
+                    android:progressTint="@color/input_dialog_slider_progress"
+                    android:thumbTint="@color/input_dialog_slider_progress"
                     android:layout_marginTop="8dp"
                     android:visibility="gone"/>
             </LinearLayout>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 4edb6f43688..c767f04a831 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -86,5 +86,8 @@
     <!-- 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 c9e01e5a612..0160ec52e35 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -227,4 +227,8 @@
     <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/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
index d3a97b6423c..9fb8a9392f7 100644
--- a/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
+++ b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
@@ -77,6 +77,9 @@ public class MouseKeysImageListAdapter extends
 
     @Override
     public void onBindViewHolder(@NonNull MouseKeyImageViewHolder holder, int position) {
+        if (mComposedSummaryList.isEmpty()) {
+            return;
+        }
         ((MouseKeyImageViewHolder) holder).bindView(DRAWABLE_LIST.get(position),
                 mComposedSummaryList.get(position));
     }
diff --git a/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java b/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
index 12604bd4b27..4432cabc0b0 100644
--- a/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
+++ b/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
@@ -63,7 +63,8 @@ public class MouseKeysMainPageFragment extends DashboardFragment
         mMouseKeyImagesPreference = screen.findPreference(KEY_MOUSE_KEY_LIST);
         mInputManager = Preconditions.checkNotNull(getActivity()
                 .getSystemService(InputManager.class));
-        String title = mCurrentInputDevice == null ? getActivity().getString(R.string.mouse_keys)
+        String title = mCurrentInputDevice == null || getHardKeyboards(getContext()).size() == 1
+                ? getActivity().getString(R.string.mouse_keys)
                 : getActivity().getString(R.string.mouse_key_main_page_title,
                         mCurrentInputDevice.getName());
         getActivity().setTitle(title);