From e29b2dbc762bfa66093d76f5a65f55328d8753c9 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Fri, 30 May 2014 23:17:03 +0200
Subject: Fade scrim in unlock animation.

This also introduces a startTime which gets sent from window manager
to SystemUI, which tells when the animation should start, to allow
for a more synchronized animation with fading out the scrim and
fading in the activity behind.

Bug: 15163546
Change-Id: I16212b1ef9eb76f1f98734da1d14fc5b7e626937
---
 services/core/java/com/android/server/wm/WindowAnimator.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'services')

diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 6fdd535..008d2fc 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -284,7 +284,7 @@ public class WindowAnimator {
                     } else if (mKeyguardGoingAway && !nowAnimating) {
                         // Timeout!!
                         Slog.e(TAG, "Timeout waiting for animation to startup");
-                        mPolicy.startKeyguardExitAnimation(0);
+                        mPolicy.startKeyguardExitAnimation(0, 0);
                         mKeyguardGoingAway = false;
                     }
                     if (win.isReadyForDisplay()) {
@@ -392,7 +392,9 @@ public class WindowAnimator {
                     winAnimator.mAnimationIsEntrance = true;
                     if (startKeyguardExit) {
                         // Do one time only.
-                        mPolicy.startKeyguardExitAnimation(a.getStartOffset());
+                        mPolicy.startKeyguardExitAnimation(mCurrentTime + a.getStartOffset(),
+                                a.getDuration());
+                        mKeyguardGoingAway = false;
                         startKeyguardExit = false;
                     }
                 }
-- 
cgit v1.1