diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-06-18 12:52:28 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-06-19 11:44:57 -0700 |
| commit | 2ecf995e0d2d55eb71d03f7230ca87270872d1a3 (patch) | |
| tree | d6a76bdbeefb0ea506d5d704ee4de0cbab3a507c /src/com/android/launcher2/Workspace.java | |
| parent | 629758ff081a354e43aa409159211210ee4ee85a (diff) | |
| download | android_packages_apps_Trebuchet-2ecf995e0d2d55eb71d03f7230ca87270872d1a3.tar.gz android_packages_apps_Trebuchet-2ecf995e0d2d55eb71d03f7230ca87270872d1a3.tar.bz2 android_packages_apps_Trebuchet-2ecf995e0d2d55eb71d03f7230ca87270872d1a3.zip | |
Remove use of private ValueAnimator api
Change-Id: I455edcd17bda83ab51c2c04fa40e66097a4d6975
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 174d23b4d..4e0c3472d 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1090,7 +1090,7 @@ public class Workspace extends SmoothPagedView if (!isSmall() && !mIsSwitchingState) { if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel(); if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel(); - mChildrenOutlineFadeInAnimation = ObjectAnimator.ofFloat(this, "childrenOutlineAlpha", 1.0f); + mChildrenOutlineFadeInAnimation = LauncherAnimUtils.ofFloat(this, "childrenOutlineAlpha", 1.0f); mChildrenOutlineFadeInAnimation.setDuration(CHILDREN_OUTLINE_FADE_IN_DURATION); mChildrenOutlineFadeInAnimation.start(); } @@ -1100,7 +1100,7 @@ public class Workspace extends SmoothPagedView if (!isSmall() && !mIsSwitchingState) { if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel(); if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel(); - mChildrenOutlineFadeOutAnimation = ObjectAnimator.ofFloat(this, "childrenOutlineAlpha", 0.0f); + mChildrenOutlineFadeOutAnimation = LauncherAnimUtils.ofFloat(this, "childrenOutlineAlpha", 0.0f); mChildrenOutlineFadeOutAnimation.setDuration(CHILDREN_OUTLINE_FADE_OUT_DURATION); mChildrenOutlineFadeOutAnimation.setStartDelay(CHILDREN_OUTLINE_FADE_OUT_DELAY); mChildrenOutlineFadeOutAnimation.start(); @@ -1145,7 +1145,7 @@ public class Workspace extends SmoothPagedView float startAlpha = getBackgroundAlpha(); if (finalAlpha != startAlpha) { if (animated) { - mBackgroundFadeOutAnimation = ValueAnimator.ofFloat(startAlpha, finalAlpha); + mBackgroundFadeOutAnimation = LauncherAnimUtils.ofFloat(startAlpha, finalAlpha); mBackgroundFadeOutAnimation.addUpdateListener(new AnimatorUpdateListener() { public void onAnimationUpdate(ValueAnimator animation) { setBackgroundAlpha(((Float) animation.getAnimatedValue()).floatValue()); @@ -1515,7 +1515,7 @@ public class Workspace extends SmoothPagedView // Initialize animation arrays for the first time if necessary initAnimationArrays(); - AnimatorSet anim = animated ? new AnimatorSet() : null; + AnimatorSet anim = animated ? LauncherAnimUtils.createAnimatorSet() : null; // Stop any scrolling, move to the current page right away setCurrentPage(getNextPage()); @@ -1631,7 +1631,7 @@ public class Workspace extends SmoothPagedView } if (mOldBackgroundAlphas[i] != 0 || mNewBackgroundAlphas[i] != 0) { - ValueAnimator bgAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(duration); + ValueAnimator bgAnim = LauncherAnimUtils.ofFloat(0f, 1f).setDuration(duration); bgAnim.setInterpolator(mZoomInInterpolator); bgAnim.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { |