diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-06 22:52:49 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-07-31 13:07:14 -0700 |
commit | 5d2fc32e6da66f877dfba4fe513fbabdcdae5f99 (patch) | |
tree | 317109f395b3fe4871eb8e023b5316fbf036206e /src/com/android/launcher3/CellLayout.java | |
parent | c1729a4d154f28c32175823e0cb9448a9c58a4e4 (diff) | |
download | android_packages_apps_Trebuchet-5d2fc32e6da66f877dfba4fe513fbabdcdae5f99.tar.gz android_packages_apps_Trebuchet-5d2fc32e6da66f877dfba4fe513fbabdcdae5f99.tar.bz2 android_packages_apps_Trebuchet-5d2fc32e6da66f877dfba4fe513fbabdcdae5f99.zip |
Several animation calls cleanup
> Using View property instead of strings to avoid extra reflection step
> Using ViewPropertyAnimator when several properties are being animated
Change-Id: I41625643b38b70bac11e2c81d18058ec878d73bd
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 31e2a7f56..078d48006 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -18,7 +18,6 @@ package com.android.launcher3; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; @@ -2156,17 +2155,14 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { a.cancel(); } - AnimatorSet s = LauncherAnimUtils.createAnimatorSet(); - a = s; - s.playTogether( - LauncherAnimUtils.ofFloat(child, "scaleX", getChildrenScale()), - LauncherAnimUtils.ofFloat(child, "scaleY", getChildrenScale()), - LauncherAnimUtils.ofFloat(child, "translationX", 0f), - LauncherAnimUtils.ofFloat(child, "translationY", 0f) - ); - s.setDuration(REORDER_ANIMATION_DURATION); - s.setInterpolator(new android.view.animation.DecelerateInterpolator(1.5f)); - s.start(); + a = new LauncherViewPropertyAnimator(child) + .scaleX(getChildrenScale()) + .scaleY(getChildrenScale()) + .translationX(0) + .translationY(0) + .setDuration(REORDER_ANIMATION_DURATION); + a.setInterpolator(new android.view.animation.DecelerateInterpolator(1.5f)); + a.start(); } } |