diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-12 01:05:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-12 01:05:59 +0000 |
| commit | 920a9c2577e1a6d08f84529d56e96da8cf25acd3 (patch) | |
| tree | a079a354ac47e8580993c78e97ab11525c04a487 /src | |
| parent | 019f5892b90b4d37ff41d34f12dd0becfff6c5ef (diff) | |
| parent | 58993ad14da65dac1e43f3490cba8f751c92085b (diff) | |
| download | android_packages_apps_Trebuchet-920a9c2577e1a6d08f84529d56e96da8cf25acd3.tar.gz android_packages_apps_Trebuchet-920a9c2577e1a6d08f84529d56e96da8cf25acd3.tar.bz2 android_packages_apps_Trebuchet-920a9c2577e1a6d08f84529d56e96da8cf25acd3.zip | |
Merge "Clean up interpolators on overview mode transition fades" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 9 |
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())); } |