diff options
| author | 2022-12-16 18:02:15 +0000 | |
|---|---|---|
| committer | 2022-12-16 18:02:15 +0000 | |
| commit | 2110d89800c712c607f4b3b25f56bd723a27a100 (patch) | |
| tree | 1617c6153783f4f142534d3c42384369860f9ebc | |
| parent | 2bc10d379c7e3001ce00f39e39df6f4003f4c689 (diff) | |
| parent | a867642f21cb4c53bf762db8d78c63283dee3974 (diff) | |
Merge "[Bouncer] Refine entry animation scrimmed." into tm-qpr-dev am: a867642f21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20695636
Change-Id: Ied6cf6fcf280f764176573aace2f9086ccfaec1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/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 67e3400670ba..061ca4f7d850 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 2cf5fb98d07e..2a3a33eff274 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) } |