From fc6b5a31a963f89dddd1c667e096101b2a28a682 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 9 Dec 2022 15:23:27 -0800 Subject: [PATCH] [Bouncer] Refine entry animation scrimmed. Bouncer is set to visible before animation begins which causes the bouncer to flicker. Bug: 260628037 Fixes: 260404351 Test: Open and close bouncer scrimmed from clicking on settings icon in notif shade a bunch of times. Change-Id: I8c1e806e094afa0ad2e5162b28755c6d8ec34efa --- .../SystemUI/src/com/android/keyguard/KeyguardPINView.java | 3 +-- .../keyguard/domain/interactor/PrimaryBouncerInteractor.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java index 67e3400670ba9..061ca4f7d8503 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java @@ -177,8 +177,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { @Override public void startAppearAnimation() { - setAlpha(1f); - setTranslationY(0); if (mAppearAnimator.isRunning()) { mAppearAnimator.cancel(); } @@ -215,6 +213,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { /** Animate subviews according to expansion or time. */ private void animate(float progress) { + setAlpha(progress); Interpolator standardDecelerate = Interpolators.STANDARD_DECELERATE; Interpolator legacyDecelerate = Interpolators.LEGACY_DECELERATE; 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 2cf5fb98d07e0..2a3a33eff2749 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 @@ -77,7 +77,6 @@ constructor( /** Runnable to show the primary bouncer. */ val showRunnable = Runnable { - repository.setPrimaryVisible(true) repository.setPrimaryShow( KeyguardBouncerModel( promptReason = repository.bouncerPromptReason ?: 0, @@ -86,6 +85,7 @@ constructor( ) ) repository.setPrimaryShowingSoon(false) + repository.setPrimaryVisible(true) primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE) }