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

Commit fb050685 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...

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

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

Change-Id: I1d14d6d6665798008d8a3cc1da165245093b8d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 719d7559 0fc8f1f0

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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)
	}		}