commit b805bb8b660c5897e7a379fb2d79815269039271
author Gus Prevas <kprevas@google.com> Tue Dec 29 07:12:10 2015 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 29 07:12:10 2015 -0800
tree f4555c60a983e870fe09f21c09ce7b7810b6e0d8
parent 4bbd3c4819fa9766442f6a063a4be2a786be8180
parent 1d3bac82b3bc59fd7225a3c27b32db2fc90b0308

Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
am: 1d3bac82b3

* commit '1d3bac82b3bc59fd7225a3c27b32db2fc90b0308':
  Defines task to front/back animations in styles_micro.

core/res/res/values/styles_micro.xml

diff --git a/core/res/res/values/styles_micro.xml b/core/res/res/values/styles_micro.xml
index 05835e7..7dde5f8 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>