summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Gus Prevas <kprevas@google.com> 2015-12-29 15:20:39 +0000
committer android-build-merger <android-build-merger@google.com> 2015-12-29 15:20:39 +0000
commit5211f9bcbb2faba350e044c7d19f7af4e167b525 (patch)
treeac9d664225c5ddd71a1b911aa972deef9a38b46f
parent91fc6d1f9cd5e83eec5753ef92960d03367c33a6 (diff)
parent19c7ad05f7bc950ffe23dcb3d01668229b4735c1 (diff)
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev am: 1d3bac82b3 am: b805bb8b66
am: 19c7ad05f7 * commit '19c7ad05f7bc950ffe23dcb3d01668229b4735c1': Defines task to front/back animations in styles_micro.
-rw-r--r--core/res/res/values/styles_micro.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/styles_micro.xml b/core/res/res/values/styles_micro.xml
index 05835e7b41ab..7dde5f8fc96a 100644
--- a/core/res/res/values/styles_micro.xml
+++ b/core/res/res/values/styles_micro.xml
@@ -26,6 +26,10 @@
<item name="taskOpenExitAnimation">@null</item>
<item name="taskCloseEnterAnimation">@null</item>
<item name="taskCloseExitAnimation">@anim/slide_out_micro</item>
+ <item name="taskToFrontEnterAnimation">@anim/slide_in_micro</item>
+ <item name="taskToFrontExitAnimation">@null</item>
+ <item name="taskToBackEnterAnimation">@null</item>
+ <item name="taskToBackExitAnimation">@anim/slide_out_micro</item>
<item name="wallpaperOpenEnterAnimation">@null</item>
<item name="wallpaperOpenExitAnimation">@anim/slide_out_micro</item>
<item name="wallpaperCloseEnterAnimation">@anim/slide_in_micro</item>