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

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

Merge "Update string for Action button when in customize mode" into main

parents e001106e 7a002e11

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -4272,6 +4272,10 @@ 
         any key  yet. The helper is a component that shows the user which keyboard shortcuts

         any key  yet. The helper is a component that shows the user which keyboard shortcuts

         they can use. [CHAR LIMIT=NONE] -->

         they can use. [CHAR LIMIT=NONE] -->

    <string name="shortcut_helper_add_shortcut_dialog_placeholder">Press key</string>

    <string name="shortcut_helper_add_shortcut_dialog_placeholder">Press key</string>

    <!-- Action key, used in keyboard shortcut helper to combine keys for shortcut. E.g. Action + 1

         The helper is a component that shows the user which keyboard shortcuts they can use.

         [CHAR LIMIT=NONE] -->

    <string name="shortcut_helper_customizer_action_key_text">Action</string>

    <!-- Error message displayed when the user select a key combination that is already in use while

    <!-- Error message displayed when the user select a key combination that is already in use while

         assigning a new custom key combination to a shortcut in shortcut helper. The helper is a

         assigning a new custom key combination to a shortcut in shortcut helper. The helper is a

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

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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -466,7 +466,7 @@ private fun ActionKeyContainer(defaultModifierKey: ShortcutKey.Icon.ResIdIcon) { 
@Composable

@Composable

private fun ActionKeyText() {

private fun ActionKeyText() {

    Text(

    Text(

        text = "Action",

        text = stringResource(R.string.shortcut_helper_customizer_action_key_text),

        style = MaterialTheme.typography.titleMedium,

        style = MaterialTheme.typography.titleMedium,

        fontSize = 16.sp,

        fontSize = 16.sp,

        lineHeight = 24.sp,

        lineHeight = 24.sp,