commit 7d965a4c0e29a764039a13c9eb125b483291dd50
author Chulwoo Lee <chulwoo@google.com> Wed May 04 19:54:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 04 19:54:01 2016 +0000
tree 01947dcde6b20c9a07810990150212fb07ca1245
parent dcc50cb2201e672c3dcd286dc1e29a58be72a751
parent 4a978d3d3c1163179ca7b387abcaf572a9a14889

Merge "Run the animators together" into nyc-dev
am: 4a978d3d3c

* commit '4a978d3d3c1163179ca7b387abcaf572a9a14889':
  Run the animators together

Change-Id: I72e4526266605c3cbe0ee1b6a2eeb44c42dac1d1

v17/leanback/src/android/support/v17/leanback/app/OnboardingFragment.java

diff --git a/v17/leanback/src/android/support/v17/leanback/app/OnboardingFragment.java b/v17/leanback/src/android/support/v17/leanback/app/OnboardingFragment.java
index 9e170f7..bfd0f14 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/OnboardingFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/OnboardingFragment.java
@@ -616,22 +616,23 @@
             Animator navigatorFadeOutAnimator = AnimatorInflater.loadAnimator(getActivity(),
                     R.animator.lb_onboarding_page_indicator_fade_out);
             navigatorFadeOutAnimator.setTarget(mPageIndicator);
-            Animator buttonFadeInAnimator = AnimatorInflater.loadAnimator(getActivity(),
-                    R.animator.lb_onboarding_start_button_fade_in);
-            buttonFadeInAnimator.setTarget(mStartButton);
-            animators.add(navigatorFadeOutAnimator);
             navigatorFadeOutAnimator.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     mPageIndicator.setVisibility(View.GONE);
                 }
             });
+            animators.add(navigatorFadeOutAnimator);
+            Animator buttonFadeInAnimator = AnimatorInflater.loadAnimator(getActivity(),
+                    R.animator.lb_onboarding_start_button_fade_in);
+            buttonFadeInAnimator.setTarget(mStartButton);
             animators.add(buttonFadeInAnimator);
         } else if (previousPage == getPageCount() - 1) {
             mPageIndicator.setVisibility(View.VISIBLE);
             Animator navigatorFadeInAnimator = AnimatorInflater.loadAnimator(getActivity(),
                     R.animator.lb_onboarding_page_indicator_fade_in);
             navigatorFadeInAnimator.setTarget(mPageIndicator);
+            animators.add(navigatorFadeInAnimator);
             Animator buttonFadeOutAnimator = AnimatorInflater.loadAnimator(getActivity(),
                     R.animator.lb_onboarding_start_button_fade_out);
             buttonFadeOutAnimator.setTarget(mStartButton);
@@ -641,9 +642,7 @@
                     mStartButton.setVisibility(View.GONE);
                 }
             });
-            mAnimator = new AnimatorSet();
-            mAnimator.playTogether(navigatorFadeInAnimator, buttonFadeOutAnimator);
-            mAnimator.start();
+            animators.add(buttonFadeOutAnimator);
         }
         mAnimator = new AnimatorSet();
         mAnimator.playTogether(animators);

v17/leanback/src/android/support/v17/leanback/app/OnboardingSupportFragment.java

diff --git a/v17/leanback/src/android/support/v17/leanback/app/OnboardingSupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/OnboardingSupportFragment.java
index 4fc4718..d873f61 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/OnboardingSupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/OnboardingSupportFragment.java
@@ -618,22 +618,23 @@
             Animator navigatorFadeOutAnimator = AnimatorInflater.loadAnimator(getActivity(),
                     R.animator.lb_onboarding_page_indicator_fade_out);
             navigatorFadeOutAnimator.setTarget(mPageIndicator);
-            Animator buttonFadeInAnimator = AnimatorInflater.loadAnimator(getActivity(),
-                    R.animator.lb_onboarding_start_button_fade_in);
-            buttonFadeInAnimator.setTarget(mStartButton);
-            animators.add(navigatorFadeOutAnimator);
             navigatorFadeOutAnimator.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     mPageIndicator.setVisibility(View.GONE);
                 }
             });
+            animators.add(navigatorFadeOutAnimator);
+            Animator buttonFadeInAnimator = AnimatorInflater.loadAnimator(getActivity(),
+                    R.animator.lb_onboarding_start_button_fade_in);
+            buttonFadeInAnimator.setTarget(mStartButton);
             animators.add(buttonFadeInAnimator);
         } else if (previousPage == getPageCount() - 1) {
             mPageIndicator.setVisibility(View.VISIBLE);
             Animator navigatorFadeInAnimator = AnimatorInflater.loadAnimator(getActivity(),
                     R.animator.lb_onboarding_page_indicator_fade_in);
             navigatorFadeInAnimator.setTarget(mPageIndicator);
+            animators.add(navigatorFadeInAnimator);
             Animator buttonFadeOutAnimator = AnimatorInflater.loadAnimator(getActivity(),
                     R.animator.lb_onboarding_start_button_fade_out);
             buttonFadeOutAnimator.setTarget(mStartButton);
@@ -643,9 +644,7 @@
                     mStartButton.setVisibility(View.GONE);
                 }
             });
-            mAnimator = new AnimatorSet();
-            mAnimator.playTogether(navigatorFadeInAnimator, buttonFadeOutAnimator);
-            mAnimator.start();
+            animators.add(buttonFadeOutAnimator);
         }
         mAnimator = new AnimatorSet();
         mAnimator.playTogether(animators);