Merge "Custom Lockscreen Shortcut preview reflects whether a shortcut is activated" into tm-qpr-dev (74527a3f) · Commits · e / os / android_frameworks_base

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,

+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"),