summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Kwan <mkwan@google.com> 2016-11-30 22:56:42 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-30 22:56:42 +0000
commit290b709392495675fe7e69288e4a7a34e81bfde0 (patch)
tree2f4a32c342aa0d3ad18232e08f68e74b28708128
parent5825b9f05bb9c6aa2ec4852586b9c8bcbb94722c (diff)
parent24a3616e37342a4ffe4c5f46d8fb8c553bf2e1d6 (diff)
Change activity dismiss animation to move left to right. am: 6d969ea4d8
am: 24a3616e37 Change-Id: I74f9168958336633dc9dcc084d29a8c70232b818
-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 c70874c626b8..6e7df4fbef64 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:fromYDelta="5%p" android:toYDelta="0"
+ <translate android:fromXDelta="5%p" android:toXDelta="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 c6470935e5d2..7532ee383477 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="top">
- <translate android:fromYDelta="0" android:toYDelta="5%p"
+ <translate android:fromXDelta="0" android:toXDelta="5%p"
android:duration="250"
android:interpolator="@android:interpolator/fast_out_slow_in"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"