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

Commit 2aba350b authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Prevent resize animation from changing the requested visibilities" into sc-v2-dev

parents f1650d86 65ba8618

core/java/android/view/InsetsController.java

+5 −0
Original line number Diff line number Diff line
@@ -1266,6 +1266,11 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
    public void notifyFinished(InsetsAnimationControlRunner runner, boolean shown) {

        cancelAnimation(runner, false /* invokeCallback */);

        if (DEBUG) Log.d(TAG, "notifyFinished. shown: " + shown);

        if (runner.getAnimationType() == ANIMATION_TYPE_RESIZE) {

            // The resize animation doesn't show or hide the insets. We shouldn't change the

            // requested visibility.

            return;

        }

        if (shown) {

            showDirectly(runner.getTypes(), true /* fromIme */);

        } else {

core/java/android/view/InsetsResizeAnimationRunner.java

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ public class InsetsResizeAnimationRunner implements InsetsAnimationControlRunner 


    @Override

    public boolean applyChangeInsets(InsetsState outState) {

        if (mCancelled) {

            return false;

        }

        final float fraction = mAnimation.getInterpolatedFraction();

        for (@InternalInsetsType int type = 0; type < InsetsState.SIZE; type++) {

            final InsetsSource fromSource = mFromState.peekSource(type);