PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Physical Keyboard] Fix L18n test bugs" into main

Browse Source
This commit is contained in:
Shaowei Shen
2025-01-09 01:39:02 -08:00
committed by Android (Google) Code Review
parent e8dfb5d2fd 1f436509f0
commit 43c9d7d26e
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
View File

@@ -38,6 +38,7 @@ import java.util.Locale;
public class MouseKeysImageListAdapter extends
RecyclerView.Adapter<MouseKeysImageListAdapter.MouseKeyImageViewHolder> {
private static final String LABEL_DELIMITER = ", ";
private static final ImmutableList<Integer> DRAWABLE_LIST = ImmutableList.of(
R.drawable.mouse_keys_directional, R.drawable.mouse_keys_click,
R.drawable.mouse_keys_press_hold, R.drawable.mouse_keys_release,
@@ -93,7 +94,7 @@ public class MouseKeysImageListAdapter extends
List<String> directionalLabelList = DIRECTIONAL_CHAR_KEYCODE_LIST.stream().map(
(key) -> getDisplayLabel(currentInputDevice, key)).toList();
mComposedSummaryList.add(context.getString(R.string.mouse_keys_directional_summary,
String.join(",", directionalLabelList)));
String.join(LABEL_DELIMITER, directionalLabelList)));
String leftClickLabel = getDisplayLabel(currentInputDevice, LEFT_CLICK_CHAR_KEYCODE);
mComposedSummaryList.add(
context.getString(R.string.mouse_keys_click_summary, leftClickLabel));
@@ -107,7 +108,8 @@ public class MouseKeysImageListAdapter extends
(key) -> getDisplayLabel(currentInputDevice, key)).toList();
mComposedSummaryList.add(context.getString(R.string.mouse_keys_toggle_scroll_summary,
toggleScrollLabelList.getFirst(),
String.join(",", toggleScrollLabelList.subList(1, toggleScrollLabelList.size()))
String.join(LABEL_DELIMITER,
toggleScrollLabelList.subList(1, toggleScrollLabelList.size()))
));
String rightClickLabel = getDisplayLabel(currentInputDevice, RIGHT_CLICK_CHAR_KEYCODE);
mComposedSummaryList.add(