From f1ca912c21ed89a234e5b9ce9e1fd93375d29e63 Mon Sep 17 00:00:00 2001 From: Justin Mattson Date: Tue, 22 Jul 2014 13:27:14 -0700 Subject: [PATCH] Add fragment animations to setup leanback theme Change-Id: I1f2c2297d73577d215bef686e5a0d56ae146adc9 --- .../leanback_setup_fragment_close_enter.xml | 27 +++++++ .../leanback_setup_fragment_close_exit.xml | 34 +++++++++ .../leanback_setup_fragment_open_enter.xml | 34 +++++++++ .../leanback_setup_fragment_open_exit.xml | 27 +++++++ core/res/res/values/dimens_leanback.xml | 71 ++++++++++++++++++- core/res/res/values/styles_leanback.xml | 6 ++ core/res/res/values/themes_leanback.xml | 1 + 7 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 core/res/res/animator/leanback_setup_fragment_close_enter.xml create mode 100644 core/res/res/animator/leanback_setup_fragment_close_exit.xml create mode 100644 core/res/res/animator/leanback_setup_fragment_open_enter.xml create mode 100644 core/res/res/animator/leanback_setup_fragment_open_exit.xml diff --git a/core/res/res/animator/leanback_setup_fragment_close_enter.xml b/core/res/res/animator/leanback_setup_fragment_close_enter.xml new file mode 100644 index 0000000000000..1626dd34f7b74 --- /dev/null +++ b/core/res/res/animator/leanback_setup_fragment_close_enter.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/core/res/res/animator/leanback_setup_fragment_close_exit.xml b/core/res/res/animator/leanback_setup_fragment_close_exit.xml new file mode 100644 index 0000000000000..a827df40213d6 --- /dev/null +++ b/core/res/res/animator/leanback_setup_fragment_close_exit.xml @@ -0,0 +1,34 @@ + + + + + + diff --git a/core/res/res/animator/leanback_setup_fragment_open_enter.xml b/core/res/res/animator/leanback_setup_fragment_open_enter.xml new file mode 100644 index 0000000000000..34b9a579e6f4b --- /dev/null +++ b/core/res/res/animator/leanback_setup_fragment_open_enter.xml @@ -0,0 +1,34 @@ + + + + + + diff --git a/core/res/res/animator/leanback_setup_fragment_open_exit.xml b/core/res/res/animator/leanback_setup_fragment_open_exit.xml new file mode 100644 index 0000000000000..5622db488981c --- /dev/null +++ b/core/res/res/animator/leanback_setup_fragment_open_exit.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/core/res/res/values/dimens_leanback.xml b/core/res/res/values/dimens_leanback.xml index fb5f8f09b51e7..c824a2a79f830 100644 --- a/core/res/res/values/dimens_leanback.xml +++ b/core/res/res/values/dimens_leanback.xml @@ -1,4 +1,4 @@ - + - + + 0.2 + + 500 + 1.0 + 0.0 + + 0dp + 0 + + 100dp + 200 + + + + @dimen/leanback_setup_alpha_animiation_min_opacity + + @dimen/leanback_setup_alpha_animiation_max_opacity + 0 + @integer/leanback_setup_base_animation_duration + + @dimen/leanback_setup_alpha_animiation_max_opacity + + @dimen/leanback_setup_alpha_animiation_min_opacity + 0 + @integer/leanback_setup_base_animation_duration + + + + + @dimen/leanback_setup_alpha_animiation_min_opacity + @dimen/leanback_setup_alpha_animiation_max_opacity + 0 + @integer/leanback_setup_base_animation_duration + + @dimen/leanback_setup_alpha_animiation_max_opacity + @dimen/leanback_setup_alpha_animiation_min_opacity + 0 + @integer/leanback_setup_base_animation_duration + + + @dimen/leanback_setup_translation_content_cliff + @integer/leanback_setup_translation_content_cliff_v4 + @dimen/leanback_setup_translation_content_resting_point + @integer/leanback_setup_translation_content_resting_point_v4 + 0 + @integer/leanback_setup_base_animation_duration + + + + @dimen/leanback_setup_alpha_animiation_min_opacity + @dimen/leanback_setup_alpha_animiation_max_opacity + 0 + @integer/leanback_setup_base_animation_duration + + + @dimen/leanback_setup_alpha_animiation_max_opacity + @dimen/leanback_setup_alpha_animiation_min_opacity + 0 + @integer/leanback_setup_base_animation_duration + + + @dimen/leanback_setup_translation_content_resting_point + @integer/leanback_setup_translation_content_resting_point_v4 + @dimen/leanback_setup_translation_content_cliff + @integer/leanback_setup_translation_content_cliff_v4 + 0 + @integer/leanback_setup_base_animation_duration diff --git a/core/res/res/values/styles_leanback.xml b/core/res/res/values/styles_leanback.xml index 72735f759f436..da83c363a5176 100644 --- a/core/res/res/values/styles_leanback.xml +++ b/core/res/res/values/styles_leanback.xml @@ -65,4 +65,10 @@ sans-serif-condensed + diff --git a/core/res/res/values/themes_leanback.xml b/core/res/res/values/themes_leanback.xml index 1cda843becfb7..0a2c0a4864ea6 100644 --- a/core/res/res/values/themes_leanback.xml +++ b/core/res/res/values/themes_leanback.xml @@ -58,5 +58,6 @@ @style/TextAppearance.Leanback.FormWizard.ListItem @style/TextAppearance.Leanback.FormWizard @color/primary_text_leanback_formwizard_dark + @style/WindowAnimationStyle.Leanback.Setup