From fc77c016f4c949d30c51ad0dd59adb6de49e968a Mon Sep 17 00:00:00 2001
From: Jordan Demeulenaere <jdemeulenaere@google.com>
Date: Tue, 1 Feb 2022 14:56:28 +0100
Subject: [PATCH] Change the default dialog animations

This CL changes the device default enter/exit dialog animations to match
go/motion-dialogs as much as possible. See b/217356408#comment1 and
 #comment2 for before/after videos.

Bug: 217356408
Test: Manual
Change-Id: I97cc993ea86bbe0e33e41cc7ad24c6a743ea0bdc
---
 core/res/res/anim/popup_enter_material.xml | 13 ++++++++++---
 core/res/res/anim/popup_exit_material.xml  | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/core/res/res/anim/popup_enter_material.xml b/core/res/res/anim/popup_enter_material.xml
index 79de26ba144f1..ef5b7c05191b1 100644
--- a/core/res/res/anim/popup_enter_material.xml
+++ b/core/res/res/anim/popup_enter_material.xml
@@ -16,7 +16,14 @@
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false" >
-    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
-           android:interpolator="@interpolator/decelerate_cubic"
-           android:duration="@android:integer/config_activityShortDur" />
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:interpolator="@interpolator/standard"
+        android:duration="@android:integer/config_activityDefaultDur" />
+    <translate
+        android:fromYDelta="20dp"
+        android:toYDelta="0"
+        android:interpolator="@interpolator/standard"
+        android:duration="@android:integer/config_activityDefaultDur" />
 </set>
diff --git a/core/res/res/anim/popup_exit_material.xml b/core/res/res/anim/popup_exit_material.xml
index 7d7d5c5468f98..1efa7021791ea 100644
--- a/core/res/res/anim/popup_exit_material.xml
+++ b/core/res/res/anim/popup_exit_material.xml
@@ -16,7 +16,14 @@
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false" >
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-           android:interpolator="@interpolator/decelerate_cubic"
-           android:duration="@android:integer/config_activityShortDur"/>
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:interpolator="@interpolator/standard_accelerate"
+        android:duration="@android:integer/config_activityShortDur" />
+    <translate
+        android:fromYDelta="0"
+        android:toYDelta="-10dp"
+        android:interpolator="@interpolator/standard_accelerate"
+        android:duration="@android:integer/config_activityShortDur" />
 </set>