summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Kwan <mkwan@google.com> 2016-12-03 11:33:27 -0800
committer Michael Kwan <mkwan@google.com> 2016-12-03 11:33:27 -0800
commitac9443ef9c0988482aa78e654bbc44afc7725e9c (patch)
tree1e5d7408c4f78e650f2fce46e2ae50e67751059a
parent5b64f51a1c5ddf809f504028944aff823ea6f114 (diff)
Revert "Change activity dismiss animation to move left to right."
This reverts commit 6d969ea4d86918ce8e2e3fb6618527c55f0c05da. Change-Id: I39ab1bc00d20b6a719ac0930e5596e14fd8345b7
-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"