summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/res/res/anim/popup_enter_material.xml13
-rw-r--r--core/res/res/anim/popup_exit_material.xml13
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 79de26ba144f..ef5b7c05191b 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 7d7d5c5468f9..1efa7021791e 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>