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

Commit 674b8384 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix floating IME visibility" into rvc-dev am: 292da01e am:... 

Merge "Merge "Fix floating IME visibility" into rvc-dev am: 292da01e am: 84a75c62" into rvc-d1-dev-plus-aosp
parents 36bf73a0 1feebcf9

core/java/android/view/InsetsAnimationControlImpl.java

+2 −3
Original line number Diff line number Diff line
@@ -196,11 +196,10 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll 
        if (mCancelled || mFinished) {

            return;

        }

        mShownOnFinish = shown;

        setInsetsAndAlpha(shown ? mShownInsets : mHiddenInsets, 1f /* alpha */, 1f /* fraction */);

        mFinished = true;

        mListener.onFinished(this);



        mShownOnFinish = shown;

    }



    @Override
@@ -301,7 +300,7 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll 
                        .withAlpha(side == ISIDE_FLOATING ? 1 : alpha)

                        .withMatrix(mTmpMatrix)

                        .withVisibility(side == ISIDE_FLOATING

                                ? state.getSource(source.getType()).isVisible()

                                ? mShownOnFinish

                                : inset != 0 /* visible */)

                        .build();

                surfaceParams.add(params);