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

Commit 8962016c authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Custom Lockscreen Shortcut preview reflects whether a shortcut is... 

Merge "Custom Lockscreen Shortcut preview reflects whether a shortcut is activated" into tm-qpr-dev am: 74527a3f

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



Change-Id: Ifd26179e0c0dccd78e56ef976fd2c8f06c5f47cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99333024 74527a3f

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt

+3 −1
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ constructor( 
                            previewMode.isInPreviewMode &&

                                previewMode.shouldHighlightSelectedAffordance &&

                                !isSelected,

                        forceInactive = previewMode.isInPreviewMode

                    )

                }

                .distinctUntilChanged()
@@ -198,6 +199,7 @@ constructor( 
        isClickable: Boolean,

        isSelected: Boolean,

        isDimmed: Boolean,

        forceInactive: Boolean,

    ): KeyguardQuickAffordanceViewModel {

        return when (this) {

            is KeyguardQuickAffordanceModel.Visible ->
@@ -213,7 +215,7 @@ constructor( 
                        )

                    },

                    isClickable = isClickable,

                    isActivated = activationState is ActivationState.Active,

                    isActivated = !forceInactive && activationState is ActivationState.Active,

                    isSelected = isSelected,

                    useLongPress = quickAffordanceInteractor.useLongPress,

                    isDimmed = isDimmed,

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { 
                    TestConfig(

                        isVisible = true,

                        isClickable = false,

                        isActivated = true,

                        isActivated = false,

                        icon = icon,

                        canShowWhileLocked = false,

                        intent = Intent("action"),
@@ -363,7 +363,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { 
                    TestConfig(

                        isVisible = true,

                        isClickable = false,

                        isActivated = true,

                        isActivated = false,

                        icon = icon,

                        canShowWhileLocked = false,

                        intent = Intent("action"),