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"/>
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 @@
@android:color/system_accent1_100
@android:color/system_accent1_100
+
+
+ @android:color/system_on_primary_container_dark
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 @@
@android:color/system_accent1_800
@android:color/system_accent1_800
@android:color/system_neutral2_50
+
+
+ @android:color/system_on_primary_dark
+ @android:color/system_outline_light
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);