summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Kwan <mkwan@google.com> 2016-12-06 02:17:42 +0000
committer android-build-merger <android-build-merger@google.com> 2016-12-06 02:17:42 +0000
commitd4b161198e71a8ec36bc6143d1adbf6c2e1d9b1d (patch)
tree43f8855399303dff82406e6e39b930ed83f47c37
parent6e9cf8d8fde8feecf8d316eafca48d7e3ae616f7 (diff)
parent7b1d53f1f070cc73726bb29fcb41cb2cc9d001e3 (diff)
Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c
am: 7b1d53f1f0 Change-Id: I052df9a7a5e5cbfed38c8daf9eabbe093c6926d4
-rw-r--r--core/res/res/anim/slide_in_enter_micro.xml2
-rw-r--r--core/res/res/anim/slide_out_micro.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/anim/slide_in_enter_micro.xml b/core/res/res/anim/slide_in_enter_micro.xml
index 6e7df4fbef64..c70874c626b8 100644
--- a/core/res/res/anim/slide_in_enter_micro.xml
+++ b/core/res/res/anim/slide_in_enter_micro.xml
@@ -19,7 +19,7 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:zAdjustment="top">
- <translate android:fromXDelta="5%p" android:toXDelta="0"
+ <translate android:fromYDelta="5%p" android:toYDelta="0"
android:duration="417"
android:interpolator="@android:interpolator/launch_task_micro_ydelta" />
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
diff --git a/core/res/res/anim/slide_out_micro.xml b/core/res/res/anim/slide_out_micro.xml
index cccf6972ba87..01df0dae6259 100644
--- a/core/res/res/anim/slide_out_micro.xml
+++ b/core/res/res/anim/slide_out_micro.xml
@@ -20,7 +20,7 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:zAdjustment="normal">
- <translate android:fromXDelta="0" android:toXDelta="5%p"
+ <translate android:fromYDelta="0" android:toYDelta="5%p"
android:duration="250"
android:interpolator="@android:interpolator/fast_out_slow_in"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"