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

Commit 2a24c407 authored by Marcello Galhardo's avatar Marcello Galhardo Committed by Automerger Merge Worker
Browse files

Merge "Update notetaking lockscreen quick affordance error dialog strings"... 

Merge "Update notetaking lockscreen quick affordance error dialog strings" into udc-dev am: aaf9a755

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22927796



Change-Id: I6ca6f4f46c742c5a769237d823c0e8ac8c5f2f92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 104b241d aaf9a755

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -3042,14 +3042,14 @@ 
    Requirement for the notes app to be available for the user to use. This is shown as part of a

    bulleted list of requirements. When all requirements are met, the app can be accessed through a

    shortcut button on the lock screen. [CHAR LIMIT=NONE] -->

    <string name="keyguard_affordance_enablement_dialog_notes_app_instruction">Select a default notes app to use notetaking shortcut</string>

    <string name="keyguard_affordance_enablement_dialog_notes_app_instruction">Select a default notes app to use the notetaking shortcut</string>



    <!---

    The action to make the lock screen shortcut for the notes app to be available for the user to

    use. This is shown as the action button in the dialog listing the requirements. When all

    requirements are met, the app can be accessed through a shortcut button on the lock screen.

    [CHAR LIMIT=NONE] -->

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

    <string name="keyguard_affordance_enablement_dialog_notes_app_action">Select app</string>



    <!--

    Error message shown when a shortcut must be pressed and held to activate it, usually shown when

packages/SystemUI/tests/src/com/android/systemui/notetask/quickaffordance/NoteTaskQuickAffordanceConfigTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ internal class NoteTaskQuickAffordanceConfigTest : SysuiTestCase() { 
        assertThat(underTest.getPickerScreenState())

            .isEqualTo(

                KeyguardQuickAffordanceConfig.PickerScreenState.Disabled(

                    listOf("Select a default notes app to use notetaking shortcut"),

                    actionText = "Open settings",

                    listOf("Select a default notes app to use the notetaking shortcut"),

                    actionText = "Select app",

                    actionComponentName =

                        "${context.packageName}$COMPONENT_NAME_SEPARATOR" +

                            "$ACTION_MANAGE_NOTES_ROLE_FROM_QUICK_AFFORDANCE"