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

Merge "Revert "[Bouncer] Refine entry animation scrimmed."" into tm-qpr-dev am: 16a8a79644

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20860901

Change-Id: Iad78d946097bfc7a5f33d0f02f401c7f5a624187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2023-01-04 20:38:26 +00:00
committed by Automerger Merge Worker
parent 043c3818df 16a8a79644
commit 0fc8f1f0bb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
View File

@@ -177,6 +177,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
@Override @Override
public void startAppearAnimation() { public void startAppearAnimation() {
setAlpha(1f);
setTranslationY(0);
if (mAppearAnimator.isRunning()) { if (mAppearAnimator.isRunning()) {
mAppearAnimator.cancel(); mAppearAnimator.cancel();
} }
@@ -213,7 +215,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
/** Animate subviews according to expansion or time. */ /** Animate subviews according to expansion or time. */
private void animate(float progress) { private void animate(float progress) {
setAlpha(progress);
Interpolator standardDecelerate = Interpolators.STANDARD_DECELERATE; Interpolator standardDecelerate = Interpolators.STANDARD_DECELERATE;
Interpolator legacyDecelerate = Interpolators.LEGACY_DECELERATE; Interpolator legacyDecelerate = Interpolators.LEGACY_DECELERATE;

2
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt
View File

@@ -77,6 +77,7 @@ constructor(
/** Runnable to show the primary bouncer. */ /** Runnable to show the primary bouncer. */
val showRunnable = Runnable { val showRunnable = Runnable {
repository.setPrimaryVisible(true)
repository.setPrimaryShow( repository.setPrimaryShow(
KeyguardBouncerModel( KeyguardBouncerModel(
promptReason = repository.bouncerPromptReason ?: 0, promptReason = repository.bouncerPromptReason ?: 0,
@@ -85,7 +86,6 @@ constructor(
) )
) )
repository.setPrimaryShowingSoon(false) repository.setPrimaryShowingSoon(false)
repository.setPrimaryVisible(true)
primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE) primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE)
} }