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

1 files changed, 4 insertions, 1 deletions

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) {}