Skip to content
Snippets Groups Projects
Commit 3abdb017 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Re-prioritize keyguard visibility animation logic" into sc-v2-dev

parents 54ea7684 b4b46a84
No related branches found
No related tags found
No related merge requests found
...@@ -121,6 +121,13 @@ public class KeyguardVisibilityHelper { ...@@ -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 { ...@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment