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/CellLayout.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/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 0760ee25d..8319cb70c 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -1082,7 +1082,7 @@ public class CellLayout extends ViewGroup { return true; } - ValueAnimator va = ValueAnimator.ofFloat(0f, 1f); + ValueAnimator va = LauncherAnimUtils.ofFloat(0f, 1f); va.setDuration(duration); mReorderAnimators.put(lp, va); @@ -2064,7 +2064,7 @@ public class CellLayout extends ViewGroup { if (finalDeltaX == 0 && finalDeltaY == 0) { return; } - ValueAnimator va = ValueAnimator.ofFloat(0f, 1f); + ValueAnimator va = LauncherAnimUtils.ofFloat(0f, 1f); a = va; va.setRepeatMode(ValueAnimator.REVERSE); va.setRepeatCount(ValueAnimator.INFINITE); @@ -2106,13 +2106,13 @@ public class CellLayout extends ViewGroup { a.cancel(); } - AnimatorSet s = new AnimatorSet(); + AnimatorSet s = LauncherAnimUtils.createAnimatorSet(); a = s; s.playTogether( - ObjectAnimator.ofFloat(child, "scaleX", 1f), - ObjectAnimator.ofFloat(child, "scaleY", 1f), - ObjectAnimator.ofFloat(child, "translationX", 0f), - ObjectAnimator.ofFloat(child, "translationY", 0f) + LauncherAnimUtils.ofFloat(child, "scaleX", 1f), + LauncherAnimUtils.ofFloat(child, "scaleY", 1f), + LauncherAnimUtils.ofFloat(child, "translationX", 0f), + LauncherAnimUtils.ofFloat(child, "translationY", 0f) ); s.setDuration(REORDER_ANIMATION_DURATION); s.setInterpolator(new android.view.animation.DecelerateInterpolator(1.5f)); |