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

Commit 1a3efa3f authored by Taran Singh's avatar Taran Singh Committed by Automerger Merge Worker
Browse files

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

Change-Id: I8521184852d941726fb7386259c538e321a34321
parents 3c9a0f79 292da01e

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);