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

Commit 82dd0cff authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix alpha when applying insets" into rvc-dev am: b8138a28 am: 46d2275c 

Change-Id: I85171d77d8c0c166351a3248ad18c8ceccdda511
parents ef0c8f9a 46d2275c

core/java/android/view/InsetsAnimationControlImpl.java

+5 −6
Original line number Diff line number Diff line
@@ -166,18 +166,17 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll 
            return false;

        }

        final Insets offset = Insets.subtract(mShownInsets, mPendingInsets);

        final Float alphaOffset = 1 - mPendingAlpha;

        ArrayList<SurfaceParams> params = new ArrayList<>();

        updateLeashesForSide(ISIDE_LEFT, offset.left, mShownInsets.left, mPendingInsets.left,

                params, state, alphaOffset);

                params, state, mPendingAlpha);

        updateLeashesForSide(ISIDE_TOP, offset.top, mShownInsets.top, mPendingInsets.top, params,

                state, alphaOffset);

                state, mPendingAlpha);

        updateLeashesForSide(ISIDE_RIGHT, offset.right, mShownInsets.right, mPendingInsets.right,

                params, state, alphaOffset);

                params, state, mPendingAlpha);

        updateLeashesForSide(ISIDE_BOTTOM, offset.bottom, mShownInsets.bottom,

                mPendingInsets.bottom, params, state, alphaOffset);

                mPendingInsets.bottom, params, state, mPendingAlpha);

        updateLeashesForSide(ISIDE_FLOATING, 0 /* offset */, 0 /* inset */, 0 /* maxInset */,

                params, state, alphaOffset);

                params, state, mPendingAlpha);



        mController.applySurfaceParams(params.toArray(new SurfaceParams[params.size()]));

        mCurrentInsets = mPendingInsets;