Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fc8f1f0 authored Jan 04, 2023 by Aaron Liu Committed by Automerger Merge Worker Jan 04, 2023

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

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>

parents 043c3818 16a8a796

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -177,6 +177,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {

		@Override
		public void startAppearAnimation() {
		setAlpha(1f);
		setTranslationY(0);
		if (mAppearAnimator.isRunning()) {
		mAppearAnimator.cancel();
		}
		@@ -213,7 +215,6 @@ 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;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ constructor(

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