summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/systemui/keyguard/domain
diff options
context:
space:
mode:
authorAaron Liu <aaronjli@google.com>2023-05-12 13:55:16 -0700
committerAaron Liu <aaronjli@google.com>2023-05-12 14:00:06 -0700
commit0e6ba4ffe790a1145fa230c4b795196efcbcff0a (patch)
tree56d3d3990fb3980957e93e8b7f661113c045e3bf /packages/SystemUI/src/com/android/systemui/keyguard/domain
parentef9b2174dc833516ac4764e4d0e145fa1eeefda9 (diff)
downloadbase-0e6ba4ffe790a1145fa230c4b795196efcbcff0a.tar.gz
Do not set alpha to 1f when bouncer shows
Alpha here was set to 1f everytime the bouncer shows to ensure that the bouncer shows every time. This has caused issues with the introduction of a material U background color for the bouncer. We had bugs where the bouncer alpha was 0, which is why alpha is set to 1f here. Looking at it further, setExpansion is not called in the cases that expansion is already 0f. This is because we were not setting the panel expansion to HIDDEN (1f) anytime we hide the bouncer. Fixes: 281024571 Test: Simpin/Simpuk Test: password, pattern, pin scrimmed and track Test: Testing auth and then power off and on and going back to scrimmed bouncer and tracked bouncer. Change-Id: I572280daef98da64045e12508a6efd60141a42b6
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard/domain')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt
index 110bcd715be2..d46d6aab26c2 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt
@@ -39,6 +39,7 @@ import com.android.systemui.keyguard.data.BouncerView
import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository
import com.android.systemui.keyguard.data.repository.TrustRepository
import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants
+import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN
import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel
import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.shared.system.SysUiStatsLog
@@ -183,6 +184,7 @@ constructor(
cancelShowRunnable()
repository.setPrimaryShowingSoon(false)
repository.setPrimaryShow(false)
+ repository.setPanelExpansion(EXPANSION_HIDDEN)
primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.INVISIBLE)
Trace.endSection()
}