diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-02-13 12:13:43 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-02-16 11:19:01 -0800 |
| commit | 9e76f682f3e52afa1f11172564b883c7dfda5063 (patch) | |
| tree | 6e62354e0a5314ce2dea3a59850555a0ae1e220c /src/com/android/launcher3/PinchAnimationManager.java | |
| parent | eb04b8415368ce28bacd100b8bffa85fede734a0 (diff) | |
| download | android_packages_apps_Trebuchet-9e76f682f3e52afa1f11172564b883c7dfda5063.tar.gz android_packages_apps_Trebuchet-9e76f682f3e52afa1f11172564b883c7dfda5063.tar.bz2 android_packages_apps_Trebuchet-9e76f682f3e52afa1f11172564b883c7dfda5063.zip | |
Removing wrapper around ViewPropertyAnimator, and using ObjectAnimator
instead
Bug: 35218222
Change-Id: Ic714cf7d20989cb45f07712e8a6f6659d0e3f30d
Diffstat (limited to 'src/com/android/launcher3/PinchAnimationManager.java')
| -rw-r--r-- | src/com/android/launcher3/PinchAnimationManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PinchAnimationManager.java b/src/com/android/launcher3/PinchAnimationManager.java index bae246e9e..f8196e5f6 100644 --- a/src/com/android/launcher3/PinchAnimationManager.java +++ b/src/com/android/launcher3/PinchAnimationManager.java @@ -24,6 +24,7 @@ import android.util.Log; import android.view.View; import android.view.animation.LinearInterpolator; +import com.android.launcher3.anim.AnimationLayerSet; import com.android.launcher3.userevent.nano.LauncherLogProto.Action; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; @@ -211,7 +212,8 @@ public class PinchAnimationManager { } private void animateShowHideView(int index, final View view, boolean show) { - Animator animator = new LauncherViewPropertyAnimator(view).alpha(show ? 1 : 0).withLayer(); + Animator animator = ObjectAnimator.ofFloat(view, View.ALPHA, show ? 1 : 0); + animator.addListener(new AnimationLayerSet(view)); if (show) { view.setVisibility(View.VISIBLE); } else { |