From 7a812e245677db527b863060821e47b0ba3b0105 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Tue, 8 Jul 2014 15:31:01 -0700 Subject: Fixing issues introduced in 31cc95a0: - HotSeat needs go visible/invisible when transitioning in and out of overview mode - Animation listener for setting alphas needs to remove itself when the animation finishes Change-Id: I654c0e700c9bc3f77692ed653f8158cec1f2430b --- src/com/android/launcher3/Workspace.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 15187e92e..78af5f95f 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2495,6 +2495,7 @@ public class Workspace extends SmoothPagedView hotseatAlpha.setInterpolator(null); } searchBarAlpha.setInterpolator(null); + anim.play(hotseatAlpha); float mOverviewPanelSlideScale = 1.0f; @@ -2505,7 +2506,7 @@ public class Workspace extends SmoothPagedView overviewPanel.setScaleY(2.0f); mOverviewPanelSlideScale = 1.0f; } - LauncherViewPropertyAnimator overviewPanelScale = new LauncherViewPropertyAnimator(overviewPanel); + final LauncherViewPropertyAnimator overviewPanelScale = new LauncherViewPropertyAnimator(overviewPanel); overviewPanelScale.scaleY(mOverviewPanelSlideScale) .alpha(finalOverviewPanelAlpha) .setInterpolator(new AccelerateDecelerateInterpolator()); @@ -2525,12 +2526,14 @@ public class Workspace extends SmoothPagedView overviewPanel.setAlpha(finalOverviewPanelAlpha); AlphaUpdateListener.updateVisibility(overviewPanel); } + overviewPanelScale.removeAllListeners(); } @Override public void onAnimationCancel(Animator animation) { overviewPanel.setAlpha(finalOverviewPanelAlpha); AlphaUpdateListener.updateVisibility(overviewPanel); + overviewPanelScale.removeAllListeners(); } @Override public void onAnimationRepeat(Animator animation) {} -- cgit v1.2.3