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

Merge "Re-prioritize keyguard visibility animation logic" into sc-v2-dev am: 3abdb0179e

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

Change-Id: I30f49ef262c24115d1db19f82c202c5767a947fa
This commit is contained in:
TreeHugger Robot
2021-11-11 14:34:56 +00:00
committed by Automerger Merge Worker
parent 9a2d62d676 3abdb0179e
commit 55bd4fe70a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java
View File

@@ -121,6 +121,13 @@ public class KeyguardVisibilityHelper {
.setStartDelay(delay); .setStartDelay(delay);
} }
animator.start(); animator.start();
} else if (mUnlockedScreenOffAnimationController.shouldAnimateInKeyguard()) {
mKeyguardViewVisibilityAnimating = true;
// Ask the screen off animation controller to animate the keyguard visibility for us
// since it may need to be cancelled due to keyguard lifecycle events.
mUnlockedScreenOffAnimationController.animateInKeyguard(
mView, mAnimateKeyguardStatusViewVisibleEndRunnable);
} else if (mLastOccludedState && !isOccluded) { } else if (mLastOccludedState && !isOccluded) {
// An activity was displayed over the lock screen, and has now gone away // An activity was displayed over the lock screen, and has now gone away
mView.setVisibility(View.VISIBLE); mView.setVisibility(View.VISIBLE);
@@ -132,13 +139,6 @@ public class KeyguardVisibilityHelper {
.alpha(1f) .alpha(1f)
.withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable) .withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable)
.start(); .start();
} else if (mUnlockedScreenOffAnimationController.shouldAnimateInKeyguard()) {
mKeyguardViewVisibilityAnimating = true;
// Ask the screen off animation controller to animate the keyguard visibility for us
// since it may need to be cancelled due to keyguard lifecycle events.
mUnlockedScreenOffAnimationController.animateInKeyguard(
mView, mAnimateKeyguardStatusViewVisibleEndRunnable);
} else { } else {
mView.setVisibility(View.VISIBLE); mView.setVisibility(View.VISIBLE);
mView.setAlpha(1f); mView.setAlpha(1f);