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

Commit a3643e54 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Fix live tile overlay clipping part of the screen during swipe up to home animation 

Change-Id: I72cd99d145a251a8607ec40abcbc9b58fe32e938
Fixes: 128711026
Test: Manual
parent 3b4794f6

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

+4 −2
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
            HomeAnimationFactory homeAnimationFactory) {

        final RemoteAnimationTargetSet targetSet = mRecentsAnimationWrapper.targetSet;

        final RectF startRect = new RectF(mClipAnimationHelper.applyTransform(targetSet,

                mTransformParams.setProgress(startProgress)));

                mTransformParams.setProgress(startProgress), false /* launcherOnTop */));

        final RectF targetRect = homeAnimationFactory.getWindowTargetRect();



        final View floatingView = homeAnimationFactory.getFloatingView();
@@ -956,7 +956,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
                    windowAlphaThreshold, 0f, 1f, Interpolators.LINEAR);

            mTransformParams.setCurrentRectAndTargetAlpha(currentRect, 1f - iconAlpha)

                    .setSyncTransactionApplier(mSyncTransactionApplier);

            mClipAnimationHelper.applyTransform(targetSet, mTransformParams);

            mClipAnimationHelper.applyTransform(targetSet, mTransformParams,

                    false /* launcherOnTop */);



            if (isFloatingIconView) {

                ((FloatingIconView) floatingView).update(currentRect, iconAlpha, progress,
@@ -968,6 +969,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
            @Override

            public void onAnimationStart(Animator animation) {

                homeAnim.dispatchOnStart();

                mActivity.getRootView().getOverlay().remove(mLiveTileOverlay);

            }



            @Override

quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java

+6 −1
Original line number Diff line number Diff line
@@ -149,6 +149,11 @@ public class ClipAnimationHelper { 
    }



    public RectF applyTransform(RemoteAnimationTargetSet targetSet, TransformParams params) {

        return applyTransform(targetSet, params, true /* launcherOnTop */);

    }



    public RectF applyTransform(RemoteAnimationTargetSet targetSet, TransformParams params,

            boolean launcherOnTop) {

        if (params.currentRect == null) {

            RectF currentRect;

            mTmpRectF.set(mTargetRect);
@@ -189,7 +194,7 @@ public class ClipAnimationHelper { 
                    }

                }

                alpha = mTaskAlphaCallback.apply(app, params.targetAlpha);

            } else if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            } else if (ENABLE_QUICKSTEP_LIVE_TILE.get() && launcherOnTop) {

                crop = null;

                layer = Integer.MAX_VALUE;

            }