From 4749f1b9e04091b2e5b3cb15ff22ca12695f9e85 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 4 Apr 2018 15:09:06 -0700
Subject: [PATCH] Fade scrims slower when entering AOD

Test: visual
Change-Id: I32117a6351c3d652f845b1b46bffaade52f1fbc4
Fixes: 77539750
---
 .../android/systemui/statusbar/phone/ScrimController.java | 8 +++++++-
 .../com/android/systemui/statusbar/phone/ScrimState.java  | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 28f31621d2d13..0a9fcdbe0cac1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -68,8 +68,14 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
     private static final String TAG = "ScrimController";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
+    /**
+     * General scrim animation duration.
+     */
     public static final long ANIMATION_DURATION = 220;
-
+    /**
+     * Longer duration, currently only used when going to AOD.
+     */
+    public static final long ANIMATION_DURATION_LONG = 1000;
     /**
      * When both scrims have 0 alpha.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
index f4b6c38c4f6e0..d38c083cf41c9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -111,6 +111,7 @@ public enum ScrimState {
             mCurrentInFrontAlpha = alwaysOnEnabled ? mAodFrontScrimAlpha : 1f;
             mCurrentInFrontTint = Color.BLACK;
             mCurrentBehindTint = Color.BLACK;
+            mAnimationDuration = ScrimController.ANIMATION_DURATION_LONG;
             // DisplayPowerManager will blank the screen for us, we just need
             // to set our state.
             mAnimateChange = !mDisplayRequiresBlanking;