Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43c9d7d2 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

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

parents e8dfb5d2 1f436509

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4712,7 +4712,7 @@ 
    <string name="mouse_keys_release2_summary">Use the \“<xliff:g id="release_2_label" example="/">%s</xliff:g>\” key to click the secondary mouse button</string>









    <!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->









    <string name="keyboard_shortcuts_helper">Keyboard shortcuts</string>









    <string name="keyboard_shortcuts_helper">View keyboard shortcuts</string>









    <!-- Summary text for the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=100] -->









    <string name="keyboard_shortcuts_helper_summary">Show list of shortcuts</string>









    <!-- Title for the 'Work profile keyboards & tools' preference category inside Languages and inputs'. [CHAR LIMIT=50] -->

























res/xml/physical_keyboard_settings.xml



+1
−2






























Original line number
Diff line number
Diff line







@@ -24,8 +24,7 @@







        android:title="@string/keyboard_options_category">









        <Preference









            android:key="keyboard_shortcuts_helper"









            android:title="@string/keyboard_shortcuts_helper"









            android:summary="@string/keyboard_shortcuts_helper_summary" />









            android:title="@string/keyboard_shortcuts_helper"/>



















        <Preference









            android:key="modifier_keys_settings"
































src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java



+4
−2






























Original line number
Diff line number
Diff line







@@ -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(