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

Commit 9f50bbf7 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fixing animation regression due to ag/957220." into nyc-dev am: de917099 

am: 4b49c7a1

* commit '4b49c7a1':
  Fixing animation regression due to ag/957220.

Change-Id: I70a644ef9de272b09c3b6297b0febb683fd66275
parents aab78a84 4b49c7a1

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ public class TaskStackLayoutAlgorithm { 
        int prevFocusState = mFocusState;

        mFocusState = focusState;

        updateFrontBackTransforms();

        if (mCb != null && (prevFocusState != focusState)) {

        if (mCb != null) {

            mCb.onFocusStateChanged(prevFocusState, focusState);

        }

    }

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+2 −2
Original line number Diff line number Diff line
@@ -1664,10 +1664,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 


    public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) {

        // Stop any scrolling

        cancelDeferredTaskViewLayoutAnimation();

        mTouchHandler.finishAnimations();

        mStackScroller.stopScroller();

        mStackScroller.stopBoundScrollAnimation();

        mTouchHandler.finishAnimations();

        cancelDeferredTaskViewLayoutAnimation();



        // Start the task animations

        mAnimationHelper.startExitToHomeAnimation(event.animated, event.getAnimationTrigger());