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

Commit 1dbec0ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where shape reveal progress gets started too early." into ub-launcher3-qt-dev

parents fafe3475 928fc8d1

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+2 −4
Original line number Diff line number Diff line
@@ -1135,12 +1135,10 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
        // FolderIconView can be seen morphing into the icon shape.

        final float windowAlphaThreshold = isFloatingIconView ? 1f - SHAPE_PROGRESS_DURATION : 1f;

        anim.addOnUpdateListener((currentRect, progress) -> {

            float interpolatedProgress = Interpolators.ACCEL_1_5.getInterpolation(progress);



            homeAnim.setPlayFraction(progress);



            float windowAlpha = Utilities.mapToRange(interpolatedProgress, 0,

                    windowAlphaThreshold, 1f, 0f, Interpolators.LINEAR);

            float windowAlpha = Math.max(0, Utilities.mapToRange(progress, 0,

                    windowAlphaThreshold, 1f, 0f, Interpolators.LINEAR));

            mTransformParams.setProgress(progress)

                    .setCurrentRectAndTargetAlpha(currentRect, windowAlpha);

            mClipAnimationHelper.applyTransform(targetSet, mTransformParams,

src/com/android/launcher3/views/FloatingIconView.java

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class FloatingIconView extends View implements 


        mTaskCornerRadius = cornerRadius / scale;

        if (mIsAdaptiveIcon) {

            if (!isOpening && shapeRevealProgress >= 0) {

            if (!isOpening && progress >= shapeProgressStart) {

                if (mRevealAnimator == null) {

                    mRevealAnimator = (ValueAnimator) IconShape.getShape().createRevealAnimator(

                            this, mStartRevealRect, mOutline, mTaskCornerRadius, !isOpening);