diff options
author | Allan Wang <me@allanwang.ca> | 2019-09-14 17:20:48 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-09-14 17:20:48 -0700 |
commit | e903778921d724b0f40944e27937843a712d4f44 (patch) | |
tree | f7c8881904f81055bcb5cf1dbde40d1853239124 /core | |
parent | 3f144bdbeeda6057d244b6a6eabff7b1f73d32ba (diff) | |
parent | b936230b609071cda99fb81436c29c45d916494a (diff) | |
download | kau-e903778921d724b0f40944e27937843a712d4f44.tar.gz kau-e903778921d724b0f40944e27937843a712d4f44.tar.bz2 kau-e903778921d724b0f40944e27937843a712d4f44.zip |
Merge remote-tracking branch 'origin/dev' into databinding
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/res-public/values/public.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml index 211c539..443f32e 100644 --- a/core/src/main/res-public/values/public.xml +++ b/core/src/main/res-public/values/public.xml @@ -1,20 +1,25 @@ <resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>
<!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task --> - <public name='kau_slide_in_top' type='anim' /> <public name='kau_slide_in_left' type='anim' /> - <public name='kau_slide_out_right' type='anim' /> + <public name='kau_slide_out_left' type='anim' /> <public name='kau_slide_out_right_top' type='anim' /> - <public name='kau_fade_in' type='anim' /> - <public name='kau_slide_out_top' type='anim' /> - <public name='kau_slide_out_bottom' type='anim' /> <public name='kau_fade_out' type='anim' /> - <public name='kau_slide_out_left' type='anim' /> <public name='kau_slide_out_left_top' type='anim' /> + <public name='kau_fade_in' type='anim' /> <public name='kau_slide_in_bottom' type='anim' /> <public name='kau_slide_in_right' type='anim' /> - <public name='kau_transparent' type='drawable' /> - <public name='kau_selectable_white' type='drawable' /> - <public name='kau_shadow_overlay' type='color' /> + <public name='kau_slide_in_top' type='anim' /> + <public name='kau_slide_out_top' type='anim' /> + <public name='kau_slide_out_bottom' type='anim' /> + <public name='kau_slide_out_right' type='anim' /> + <public name='kau_enter_slide_right' type='transition' /> + <public name='kau_exit_slide_right' type='transition' /> + <public name='kau_exit_slide_top' type='transition' /> + <public name='kau_enter_slide_bottom' type='transition' /> + <public name='kau_enter_slide_left' type='transition' /> + <public name='kau_exit_slide_left' type='transition' /> + <public name='kau_enter_slide_top' type='transition' /> + <public name='kau_exit_slide_bottom' type='transition' /> <public name='kau_activity_horizontal_margin' type='dimen' /> <public name='kau_activity_vertical_margin' type='dimen' /> <public name='kau_dialog_margin' type='dimen' /> @@ -100,6 +105,7 @@ <public name='kau_bullet_point' type='string' /> <public name='Kau' type='style' /> <public name='Kau.Translucent' type='style' /> + <public name='kau_shadow_overlay' type='color' /> <public name='KauFadeIn' type='style' /> <public name='KauFadeInFadeOut' type='style' /> <public name='KauSlideInRight' type='style' /> @@ -107,12 +113,6 @@ <public name='KauSlideInFadeOut' type='style' /> <public name='KauSlideInSlideOutRight' type='style' /> <public name='KauSlideInSlideOutBottom' type='style' /> - <public name='kau_enter_slide_bottom' type='transition' /> - <public name='kau_enter_slide_top' type='transition' /> - <public name='kau_exit_slide_bottom' type='transition' /> - <public name='kau_exit_slide_top' type='transition' /> - <public name='kau_enter_slide_right' type='transition' /> - <public name='kau_exit_slide_right' type='transition' /> - <public name='kau_exit_slide_left' type='transition' /> - <public name='kau_enter_slide_left' type='transition' /> + <public name='kau_transparent' type='drawable' /> + <public name='kau_selectable_white' type='drawable' /> </resources>
\ No newline at end of file |