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

Commit 8b3a64bf authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Fixes i18n issue with shortcut names." into udc-dev am: 5be383fb 

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



Change-Id: I9ca7c9b7eefbe8c1c8027a2f1202cbdc85429ef8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7eb351ff 5be383fb

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfig.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -52,8 +52,7 @@ constructor( 
    override val key: String

    override val key: String

        get() = BuiltInKeyguardQuickAffordanceKeys.CAMERA

        get() = BuiltInKeyguardQuickAffordanceKeys.CAMERA





    override val pickerName: String

    override fun pickerName(): String = context.getString(R.string.accessibility_camera_button)

        get() = context.getString(R.string.accessibility_camera_button)





    override val pickerIconResourceId: Int

    override val pickerIconResourceId: Int

        get() = R.drawable.ic_camera

        get() = R.drawable.ic_camera

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/DoNotDisturbQuickAffordanceConfig.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ constructor( 




    override val key: String = BuiltInKeyguardQuickAffordanceKeys.DO_NOT_DISTURB

    override val key: String = BuiltInKeyguardQuickAffordanceKeys.DO_NOT_DISTURB





    override val pickerName: String = context.getString(R.string.quick_settings_dnd_label)

    override fun pickerName(): String = context.getString(R.string.quick_settings_dnd_label)





    override val pickerIconResourceId: Int = R.drawable.ic_do_not_disturb

    override val pickerIconResourceId: Int = R.drawable.ic_do_not_disturb

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,7 @@ constructor( 
    override val key: String

    override val key: String

        get() = BuiltInKeyguardQuickAffordanceKeys.FLASHLIGHT

        get() = BuiltInKeyguardQuickAffordanceKeys.FLASHLIGHT





    override val pickerName: String

    override fun pickerName(): String = context.getString(R.string.quick_settings_flashlight_label)

        get() = context.getString(R.string.quick_settings_flashlight_label)





    override val pickerIconResourceId: Int

    override val pickerIconResourceId: Int

        get() = R.drawable.ic_flashlight_off

        get() = R.drawable.ic_flashlight_off

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ constructor( 




    override val key: String = BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS

    override val key: String = BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS





    override val pickerName: String by lazy { context.getString(component.getTileTitleId()) }

    override fun pickerName(): String = context.getString(component.getTileTitleId())





    override val pickerIconResourceId: Int by lazy { component.getTileImageId() }

    override val pickerIconResourceId: Int by lazy { component.getTileImageId() }

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceConfig.kt

+6 −2
Original line number Original line Diff line number Diff line
@@ -31,8 +31,6 @@ interface KeyguardQuickAffordanceConfig { 
    /** Unique identifier for this quick affordance. It must be globally unique. */

    /** Unique identifier for this quick affordance. It must be globally unique. */

    val key: String

    val key: String





    val pickerName: String



    val pickerIconResourceId: Int

    val pickerIconResourceId: Int





    /**

    /**
@@ -42,6 +40,12 @@ interface KeyguardQuickAffordanceConfig { 
     */

     */

    val lockScreenState: Flow<LockScreenState>

    val lockScreenState: Flow<LockScreenState>





    /**

     * Returns a user-visible [String] that should be shown as the name for the option in the

     * wallpaper picker / settings app to select this quick affordance.

     */

    fun pickerName(): String



    /**

    /**

     * Returns the [PickerScreenState] representing the affordance in the settings or selector

     * Returns the [PickerScreenState] representing the affordance in the settings or selector

     * experience.

     * experience.