From c1ad84dc846339e421698cffed0a65708f803325 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 21 May 2021 17:33:02 -0400
Subject: [PATCH] Animate out toast elevation

Test: manual
Fixes: 187443056
Change-Id: I4386ded89e2ea56e48155e60f9b442816398e025
---
 .../systemui/toast/ToastDefaultAnimation.kt   | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/toast/ToastDefaultAnimation.kt b/packages/SystemUI/src/com/android/systemui/toast/ToastDefaultAnimation.kt
index 603d69057e5c5..8187956962b6a 100644
--- a/packages/SystemUI/src/com/android/systemui/toast/ToastDefaultAnimation.kt
+++ b/packages/SystemUI/src/com/android/systemui/toast/ToastDefaultAnimation.kt
@@ -76,29 +76,41 @@ class ToastDefaultAnimation {
             }
             val linearInterp = LinearInterpolator()
             val scaleInterp = PathInterpolator(0.3f, 0f, 1f, 1f)
-            val sX = ObjectAnimator.ofFloat(view, "scaleX", 1f, 0.9f).apply {
+            val viewScaleX = ObjectAnimator.ofFloat(view, "scaleX", 1f, 0.9f).apply {
                 interpolator = scaleInterp
                 duration = 250
             }
-            val sY = ObjectAnimator.ofFloat(view, "scaleY", 1f, 0.9f).apply {
+            val viewScaleY = ObjectAnimator.ofFloat(view, "scaleY", 1f, 0.9f).apply {
                 interpolator = scaleInterp
                 duration = 250
             }
-            val vA = ObjectAnimator.ofFloat(view, "alpha", 1f, 0f).apply {
+            val viewElevation = ObjectAnimator.ofFloat(view, "elevation",
+                view.elevation, 0f).apply {
+                interpolator = linearInterp
+                duration = 40
+                startDelay = 150
+            }
+            val viewAlpha = ObjectAnimator.ofFloat(view, "alpha", 1f, 0f).apply {
                 interpolator = linearInterp
                 duration = 100
                 startDelay = 150
             }
-            val tA = ObjectAnimator.ofFloat(text, "alpha", 1f, 0f).apply {
+            val textAlpha = ObjectAnimator.ofFloat(text, "alpha", 1f, 0f).apply {
                 interpolator = linearInterp
                 duration = 166
             }
-            val iA = ObjectAnimator.ofFloat(icon, "alpha", 1f, 0f).apply {
+            val iconAlpha = ObjectAnimator.ofFloat(icon, "alpha", 1f, 0f).apply {
                 interpolator = linearInterp
                 duration = 166
             }
             return AnimatorSet().apply {
-                playTogether(sX, sY, vA, tA, iA)
+                playTogether(
+                    viewScaleX,
+                    viewScaleY,
+                    viewElevation,
+                    viewAlpha,
+                    textAlpha,
+                    iconAlpha)
             }
         }
     }