Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad Hinegardner
2023-02-24 20:07:55 +00:00
committed by Android (Google) Code Review
parent 6d21c1dc50 95bda57311
commit 74527a3fc0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,6 +187,7 @@ constructor(
previewMode.isInPreviewMode && previewMode.isInPreviewMode &&
previewMode.shouldHighlightSelectedAffordance && previewMode.shouldHighlightSelectedAffordance &&
!isSelected, !isSelected,
forceInactive = previewMode.isInPreviewMode
) )
} }
.distinctUntilChanged() .distinctUntilChanged()
@@ -198,6 +199,7 @@ constructor(
isClickable: Boolean, isClickable: Boolean,
isSelected: Boolean, isSelected: Boolean,
isDimmed: Boolean, isDimmed: Boolean,
forceInactive: Boolean,
): KeyguardQuickAffordanceViewModel { ): KeyguardQuickAffordanceViewModel {
return when (this) { return when (this) {
is KeyguardQuickAffordanceModel.Visible -> is KeyguardQuickAffordanceModel.Visible ->
@@ -213,7 +215,7 @@ constructor(
) )
}, },
isClickable = isClickable, isClickable = isClickable,
isActivated = activationState is ActivationState.Active, isActivated = !forceInactive && activationState is ActivationState.Active,
isSelected = isSelected, isSelected = isSelected,
useLongPress = quickAffordanceInteractor.useLongPress, useLongPress = quickAffordanceInteractor.useLongPress,
isDimmed = isDimmed, isDimmed = isDimmed,

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

@@ -308,7 +308,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() {
TestConfig( TestConfig(
isVisible = true, isVisible = true,
isClickable = false, isClickable = false,
isActivated = true, isActivated = false,
icon = icon, icon = icon,
canShowWhileLocked = false, canShowWhileLocked = false,
intent = Intent("action"), intent = Intent("action"),
@@ -363,7 +363,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() {
TestConfig( TestConfig(
isVisible = true, isVisible = true,
isClickable = false, isClickable = false,
isActivated = true, isActivated = false,
icon = icon, icon = icon,
canShowWhileLocked = false, canShowWhileLocked = false,
intent = Intent("action"), intent = Intent("action"),