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

Commit b6309d55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Moved keyboard settings string to resource file" into main

parents f7ff135d 090a6454

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -3745,6 +3745,10 @@ 
         use. The helper shows shortcuts in categories, which can be collapsed or expanded.

         [CHAR LIMIT=NONE] -->

    <string name="shortcut_helper_content_description_drag_handle">Drag handle</string>

    <!-- Label on the keyboard settings button in keyboard shortcut helper, that allows user to

         open keyboard settings while in shortcut helper. The helper is a  component that shows the

         user which keyboard shortcuts they can use. [CHAR LIMIT=NONE] -->

    <string name="shortcut_helper_keyboard_settings_buttons_label">Keyboard Settings</string>





    <!-- Keyboard touchpad tutorial scheduler-->

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ private fun KeyboardSettings(horizontalPadding: Dp, verticalPadding: Dp, onClick 
    ) {

        Row(verticalAlignment = Alignment.CenterVertically) {

            Text(

                "Keyboard Settings",

                stringResource(id = R.string.shortcut_helper_keyboard_settings_buttons_label),

                color = MaterialTheme.colorScheme.onSurfaceVariant,

                fontSize = 16.sp,

            )