diff options
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 78af5f95f..3523be075 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -55,6 +55,7 @@ import android.view.Display; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.ViewPropertyAnimator; import android.view.accessibility.AccessibilityManager; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Animation; @@ -2506,11 +2507,12 @@ public class Workspace extends SmoothPagedView overviewPanel.setScaleY(2.0f); mOverviewPanelSlideScale = 1.0f; } - final LauncherViewPropertyAnimator overviewPanelScale = new LauncherViewPropertyAnimator(overviewPanel); + + final ViewPropertyAnimator overviewPanelScale = overviewPanel.animate(); overviewPanelScale.scaleY(mOverviewPanelSlideScale) .alpha(finalOverviewPanelAlpha) .setInterpolator(new AccelerateDecelerateInterpolator()); - overviewPanelScale.addListener(new AnimatorListener() { + overviewPanelScale.setListener(new AnimatorListener() { @Override public void onAnimationStart(Animator animation) { if (workspaceToOverview) { @@ -2526,19 +2528,18 @@ public class Workspace extends SmoothPagedView overviewPanel.setAlpha(finalOverviewPanelAlpha); AlphaUpdateListener.updateVisibility(overviewPanel); } - overviewPanelScale.removeAllListeners(); + overviewPanelScale.setListener(null); } @Override public void onAnimationCancel(Animator animation) { overviewPanel.setAlpha(finalOverviewPanelAlpha); AlphaUpdateListener.updateVisibility(overviewPanel); - overviewPanelScale.removeAllListeners(); + overviewPanelScale.setListener(null); } @Override public void onAnimationRepeat(Animator animation) {} }); - anim.play(overviewPanelScale); if (mShowSearchBar) anim.play(searchBarAlpha); anim.play(pageIndicatorAlpha); |