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

Commit 41656627 authored by Joshua Mokut's avatar Joshua Mokut Committed by Android (Google) Code Review
Browse files

Merge "Update shortcut label for "Open assistant"" into main

parents b6a5f79c cce970d8

packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/source/TestShortcuts.kt

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ object TestShortcuts { 


    val expectedShortcutCategoriesWithSimpleShortcutCombination =

        listOf(

            simpleShortcutCategory(System, "System apps", "Open assistant"),

            simpleShortcutCategory(System, "System apps", "Open digital assistant"),

            simpleShortcutCategory(System, "System controls", "Go to home screen"),

            simpleShortcutCategory(System, "System apps", "Open settings"),

            simpleShortcutCategory(System, "System controls", "Lock screen"),

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -2354,8 +2354,8 @@ 
    <string name="group_system_access_all_apps_search">Open apps list</string>

    <!-- User visible title for the keyboard shortcut that accesses [system] settings. [CHAR LIMIT=70] -->

    <string name="group_system_access_system_settings">Open settings</string>

    <!-- User visible title for the keyboard shortcut that accesses Assistant app. [CHAR LIMIT=70] -->

    <string name="group_system_access_google_assistant">Open assistant</string>

    <!-- User visible title for the keyboard shortcut that accesses the default digital assistant app. [CHAR LIMIT=70] -->

    <string name="group_system_access_google_assistant">Open digital assistant</string>

    <!-- User visible title for the keyboard shortcut that locks screen. [CHAR LIMIT=70] -->

    <string name="group_system_lock_screen">Lock screen</string>

    <!-- User visible title for the keyboard shortcut that pulls up Notes app for quick memo. [CHAR LIMIT=70] -->