diff options
5 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index da12e67de..0df8e5a89 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -951,7 +951,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { return true; } - ValueAnimator va = LauncherAnimUtils.ofFloat(child, 0f, 1f); + ValueAnimator va = LauncherAnimUtils.ofFloat(0f, 1f); va.setDuration(duration); mReorderAnimators.put(lp, va); @@ -2047,7 +2047,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { if (noMovement) { return; } - ValueAnimator va = LauncherAnimUtils.ofFloat(child, 0f, 1f); + ValueAnimator va = LauncherAnimUtils.ofFloat(0f, 1f); a = va; // Animations are disabled in power save mode, causing the repeated animation to jump diff --git a/src/com/android/launcher3/InterruptibleInOutAnimator.java b/src/com/android/launcher3/InterruptibleInOutAnimator.java index 29df38bae..8501e2429 100644 --- a/src/com/android/launcher3/InterruptibleInOutAnimator.java +++ b/src/com/android/launcher3/InterruptibleInOutAnimator.java @@ -48,7 +48,7 @@ public class InterruptibleInOutAnimator { @Thunk int mDirection = STOPPED; public InterruptibleInOutAnimator(View view, long duration, float fromValue, float toValue) { - mAnimator = LauncherAnimUtils.ofFloat(view, fromValue, toValue).setDuration(duration); + mAnimator = LauncherAnimUtils.ofFloat(fromValue, toValue).setDuration(duration); mOriginalDuration = duration; mOriginalFromValue = fromValue; mOriginalToValue = toValue; diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java index 9ea277c13..43cf827da 100644 --- a/src/com/android/launcher3/LauncherAnimUtils.java +++ b/src/com/android/launcher3/LauncherAnimUtils.java @@ -94,7 +94,7 @@ public class LauncherAnimUtils { return anim; } - public static ValueAnimator ofFloat(View target, float... values) { + public static ValueAnimator ofFloat(float... values) { ValueAnimator anim = new ValueAnimator(); anim.setFloatValues(values); cancelOnDestroyActivity(anim); diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 3a98ae71b..e4c9be4db 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -99,7 +99,7 @@ public class DragView extends View { setScaleY(initialScale); // Animate the view into the correct position - mAnim = LauncherAnimUtils.ofFloat(this, 0f, 1f); + mAnim = LauncherAnimUtils.ofFloat(0f, 1f); mAnim.setDuration(VIEW_ZOOM_DURATION); mAnim.addUpdateListener(new AnimatorUpdateListener() { @Override @@ -237,7 +237,7 @@ public class DragView extends View { } public void crossFade(int duration) { - ValueAnimator va = LauncherAnimUtils.ofFloat(this, 0f, 1f); + ValueAnimator va = LauncherAnimUtils.ofFloat(0f, 1f); va.setDuration(duration); va.setInterpolator(new DecelerateInterpolator(1.5f)); va.addUpdateListener(new AnimatorUpdateListener() { diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 973245b92..e61b834db 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -661,7 +661,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { mScaleAnimator.cancel(); } - mScaleAnimator = LauncherAnimUtils.ofFloat(null, 0f, 1.0f); + mScaleAnimator = LauncherAnimUtils.ofFloat(0f, 1.0f); mScaleAnimator.addUpdateListener(new AnimatorUpdateListener() { @Override @@ -807,7 +807,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { final float transX0 = mTmpParams.transX; final float transY0 = mTmpParams.transY; - mValueAnimator = LauncherAnimUtils.ofFloat(FolderIcon.this, 0f, 1.0f); + mValueAnimator = LauncherAnimUtils.ofFloat(0f, 1.0f); mValueAnimator.addUpdateListener(new AnimatorUpdateListener(){ public void onAnimationUpdate(ValueAnimator animation) { float progress = animation.getAnimatedFraction(); |