am 1f8edc21: am 920a9c25: Merge "Clean up interpolators on overview mode transition fades" into jb-ub-now-indigo-rose

* commit '1f8edc2191dec2b430cb104a9e9f5db9d1ab667a':
  Clean up interpolators on overview mode transition fades

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 688acafad..4f263d0a3 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1972,6 +1972,9 @@ public class Workspace extends SmoothPagedView
 
         boolean workspaceToAllApps = (oldStateIsNormal && stateIsSmall);
         boolean allAppsToWorkspace = (oldStateIsSmall && stateIsNormal);
+        boolean workspaceToOverview = (oldStateIsNormal && stateIsOverview);
+        boolean overviewToWorkspace = (oldStateIsOverview && stateIsNormal);
+
         mNewScale = 1.0f;
 
         if (oldStateIsOverview) {
@@ -2084,6 +2087,12 @@ public class Workspace extends SmoothPagedView
             hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
             searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
 
+            if (workspaceToOverview) {
+                hotseatAlpha.setInterpolator(new DecelerateInterpolator(2));
+            } else if (overviewToWorkspace) {
+                overviewPanelAlpha.setInterpolator(new DecelerateInterpolator(2));
+            }
+
             if (getPageIndicator() != null) {
                 pageIndicatorAlpha.addListener(new AlphaUpdateListener(getPageIndicator()));
             }