diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-07-08 15:31:01 -0700 |
---|---|---|
committer | Raj Yengisetty <rajesh@cyngn.com> | 2014-07-08 15:34:46 -0700 |
commit | 7a812e245677db527b863060821e47b0ba3b0105 (patch) | |
tree | e3e77edf0d1cd9fe040a125261b80acf215fb368 /src/com/android/launcher3 | |
parent | 3d3dd2b0180f8bcf719003eb41b90546b82c9646 (diff) | |
download | android_packages_apps_Trebuchet-7a812e245677db527b863060821e47b0ba3b0105.tar.gz android_packages_apps_Trebuchet-7a812e245677db527b863060821e47b0ba3b0105.tar.bz2 android_packages_apps_Trebuchet-7a812e245677db527b863060821e47b0ba3b0105.zip |
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
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 5 |
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) {} |