Merge pull request #4387 from jmakovicka/anim-name-attribute

Fix animation name attributes
This commit is contained in:
vshcherb 2017-09-02 16:51:39 +02:00 committed by GitHub
commit 08874a658b

View file

@ -392,53 +392,53 @@
<style name="Animations"/> <style name="Animations"/>
<style name="Animations.NoAnimation"> <style name="Animations.NoAnimation">
<item name="@android:windowEnterAnimation">@null</item> <item name="android:windowEnterAnimation">@null</item>
<item name="@android:windowExitAnimation">@null</item> <item name="android:windowExitAnimation">@null</item>
</style> </style>
<!-- PopDownMenu --> <!-- PopDownMenu -->
<style name="Animations.PopDownMenu"/> <style name="Animations.PopDownMenu"/>
<style name="Animations.PopDownMenu.Left"> <style name="Animations.PopDownMenu.Left">
<item name="@android:windowEnterAnimation">@anim/grow_from_topleft_to_bottomright</item> <item name="android:windowEnterAnimation">@anim/grow_from_topleft_to_bottomright</item>
<item name="@android:windowExitAnimation">@anim/shrink_from_bottomright_to_topleft</item> <item name="android:windowExitAnimation">@anim/shrink_from_bottomright_to_topleft</item>
</style> </style>
<style name="Animations.PopDownMenu.Right"> <style name="Animations.PopDownMenu.Right">
<item name="@android:windowEnterAnimation">@anim/grow_from_topright_to_bottomleft</item> <item name="android:windowEnterAnimation">@anim/grow_from_topright_to_bottomleft</item>
<item name="@android:windowExitAnimation">@anim/shrink_from_bottomleft_to_topright</item> <item name="android:windowExitAnimation">@anim/shrink_from_bottomleft_to_topright</item>
</style> </style>
<style name="Animations.PopDownMenu.Center"> <style name="Animations.PopDownMenu.Center">
<item name="@android:windowEnterAnimation">@anim/grow_from_top</item> <item name="android:windowEnterAnimation">@anim/grow_from_top</item>
<item name="@android:windowExitAnimation">@anim/shrink_from_bottom</item> <item name="android:windowExitAnimation">@anim/shrink_from_bottom</item>
</style> </style>
<!-- PopUpMenu --> <!-- PopUpMenu -->
<style name="Animations.PopUpMenu"/> <style name="Animations.PopUpMenu"/>
<style name="Animations.PopUpMenu.Fade"> <style name="Animations.PopUpMenu.Fade">
<item name="@android:windowEnterAnimation">@anim/popup_show</item> <item name="android:windowEnterAnimation">@anim/popup_show</item>
<item name="@android:windowExitAnimation">@anim/popup_hide</item> <item name="android:windowExitAnimation">@anim/popup_hide</item>
</style> </style>
<style name="Animations.PopUpMenu.Left"> <style name="Animations.PopUpMenu.Left">
<item name="@android:windowEnterAnimation">@anim/grow_from_bottomleft_to_topright</item> <item name="android:windowEnterAnimation">@anim/grow_from_bottomleft_to_topright</item>
<item name="@android:windowExitAnimation">@anim/shrink_from_topright_to_bottomleft</item> <item name="android:windowExitAnimation">@anim/shrink_from_topright_to_bottomleft</item>
</style> </style>
<style name="Animations.PopUpMenu.Right"> <style name="Animations.PopUpMenu.Right">
<item name="@android:windowEnterAnimation">@anim/grow_from_bottomright_to_topleft</item> <item name="android:windowEnterAnimation">@anim/grow_from_bottomright_to_topleft</item>
<item name="@android:windowExitAnimation">@anim/shrink_from_topleft_to_bottomright</item> <item name="android:windowExitAnimation">@anim/shrink_from_topleft_to_bottomright</item>
</style> </style>
<style name="Animations.PopUpMenu.Center"> <style name="Animations.PopUpMenu.Center">
<item name="@android:windowEnterAnimation">@anim/grow_from_bottom</item> <item name="android:windowEnterAnimation">@anim/grow_from_bottom</item>
<item name="@android:windowExitAnimation">@anim/shrink_from_top</item> <item name="android:windowExitAnimation">@anim/shrink_from_top</item>
</style> </style>
<style name="Animations.PopUpMenu.Bottom"> <style name="Animations.PopUpMenu.Bottom">
<item name="@android:windowEnterAnimation">@anim/slide_in_bottom</item> <item name="android:windowEnterAnimation">@anim/slide_in_bottom</item>
<item name="@android:windowExitAnimation">@anim/slide_out_bottom</item> <item name="android:windowExitAnimation">@anim/slide_out_bottom</item>
</style> </style>
<style name="create_poi_text_field"> <style name="create_poi_text_field">