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

Commit f79d61ce authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Renaming META to ACTION in sticky key indicator" into main

parents cebc0923 610fc845

packages/SystemUI/compose/features/src/com/android/systemui/keyboard/stickykeys/ui/view/StickyKeysIndicator.kt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ fun StickyKeysIndicator(stickyKeys: Map<ModifierKey, Locked>, modifier: Modifier 
            stickyKeys.forEach { (key, isLocked) ->

                key(key) {

                    Text(

                        text = key.text,

                        text = key.displayedText,

                        fontWeight = if (isLocked.locked) FontWeight.Bold else FontWeight.Normal

                    )

                }

packages/SystemUI/src/com/android/systemui/keyboard/stickykeys/shared/model/StickyKey.kt

+2 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.systemui.keyboard.stickykeys.shared.model 
@JvmInline

value class Locked(val locked: Boolean)



enum class ModifierKey(val text: String) {

enum class ModifierKey(val displayedText: String) {

    ALT("ALT LEFT"),

    ALT_GR("ALT RIGHT"),

    CTRL("CTRL"),

    META("META"),

    META("ACTION"),

    SHIFT("SHIFT"),

}