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

Commit adca2fc1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing workspace card shifted when going to home." into ub-launcher3-master

parents 00092efb 72289860

quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+2 −5
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ public class RecentsViewStateController implements StateHandler { 
            .getBoolean("pref_scroll_to_first_task", false);

        mIsRecentsScrollingToFirstTask = mLauncher.isInState(NORMAL) && toState == OVERVIEW

                && settingEnabled;

        // TODO: Instead of animating the workspace translationX, move the contents

        mWorkspaceCard.setWorkspaceScrollingEnabled(mIsRecentsScrollingToFirstTask);



        // Scroll to the workspace card before changing to the NORMAL state.

        int currPage = mRecentsView.getCurrentPage();
@@ -88,11 +90,6 @@ public class RecentsViewStateController implements StateHandler { 
        progressAnim.setInterpolator(Interpolators.LINEAR);

        progressAnim.addListener(new AnimationSuccessListener() {



            @Override

            public void onAnimationStart(Animator animation) {

                mWorkspaceCard.setWorkspaceScrollingEnabled(mIsRecentsScrollingToFirstTask);

            }



            @Override

            public void onAnimationSuccess(Animator animator) {

                mWorkspaceCard.setWorkspaceScrollingEnabled(toState == OVERVIEW);