diff options
| author | Gus Prevas <kprevas@google.com> | 2015-12-29 15:09:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-29 15:09:26 +0000 |
| commit | 1d3bac82b3bc59fd7225a3c27b32db2fc90b0308 (patch) | |
| tree | 1e867f50519efa48471511e4d707d237614a28e2 /core | |
| parent | 9c27969385d7a59a535ba3274c279ae96a155d49 (diff) | |
| parent | fcc57db7317d9ce33636d5fb424334ecf8c5bde2 (diff) | |
| download | frameworks_base-1d3bac82b3bc59fd7225a3c27b32db2fc90b0308.zip frameworks_base-1d3bac82b3bc59fd7225a3c27b32db2fc90b0308.tar.gz frameworks_base-1d3bac82b3bc59fd7225a3c27b32db2fc90b0308.tar.bz2 | |
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/styles_micro.xml | 4 |
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 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> |