Merge "Clean up interpolators on overview mode transition fades" into jb-ub-now-indigo-rose
This commit is contained in:
@@ -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()));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user