diff options
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 0c1caeeab..63e893da1 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2500,10 +2500,11 @@ public class Workspace extends SmoothPagedView float mOverviewPanelSlideScale = 1.0f; - if (overviewToWorkspace) { + if (overviewToWorkspace || stateIsNormal) { + ((SlidingUpPanelLayout) overviewPanel).collapsePane(); overviewPanel.setScaleY(1.0f); mOverviewPanelSlideScale = 3.0f; - } else if (workspaceToOverview) { + } else if (workspaceToOverview || stateIsOverview) { overviewPanel.setScaleY(3.0f); mOverviewPanelSlideScale = 1.0f; } @@ -2515,7 +2516,7 @@ public class Workspace extends SmoothPagedView overviewPanelScale.setListener(new AnimatorListener() { @Override public void onAnimationStart(Animator animation) { - if (workspaceToOverview) { + if (workspaceToOverview || stateIsOverview) { overviewPanel.setAlpha(finalOverviewPanelAlpha); AlphaUpdateListener.updateVisibility(overviewPanel); } @@ -2523,7 +2524,7 @@ public class Workspace extends SmoothPagedView @Override public void onAnimationEnd(Animator animation) { - if (overviewToWorkspace) { + if (overviewToWorkspace || stateIsNormal) { overviewPanel.setAlpha(finalOverviewPanelAlpha); AlphaUpdateListener.updateVisibility(overviewPanel); } |