Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 920a9c25 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Clean up interpolators on overview mode transition fades" into jb-ub-now-indigo-rose

parents 019f5892 58993ad1

src/com/android/launcher3/Workspace.java

+9 −0
Original line number Diff line number Diff line
@@ -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()));

            }