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

Commit b5efb27a authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Fix weird split-screen secondary task animation am: 1eedfc33 am: bfb07e5a 

Change-Id: I40a4e235ef7d392d0a93b2a447317660e3a1033d
parents 96cca43d bfb07e5a

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

+5 −8
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ public class AppWindowAnimationHelper implements TransformParams.BuilderProxy { 
    private void updateSourceStack(RemoteAnimationTargetCompat target) {

        mSourceInsets.set(target.contentInsets);

        mSourceStackBounds.set(target.screenSpaceBounds);



        // TODO: Should sourceContainerBounds already have this offset?

        mSourceStackBounds.offsetTo(target.position.x, target.position.y);

    }



    public void updateSource(Rect homeStackBounds, RemoteAnimationTargetCompat target) {
@@ -186,14 +183,14 @@ public class AppWindowAnimationHelper implements TransformParams.BuilderProxy { 
        crop.offsetTo(0, 0);

        float cornerRadius = 0f;

        float scale = Math.max(mCurrentRect.width(), mTargetRect.width()) / crop.width();

        mTmpMatrix.setTranslate(0, 0);

        if (app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {

            mTmpMatrix.setTranslate(app.localBounds.left, app.localBounds.top);

        }

        if (app.mode == targetMode

                && app.activityType != RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {

            mTmpMatrix.setRectToRect(mSourceRect, mCurrentRect, ScaleToFit.FILL);

            if (app.localBounds != null) {

            mTmpMatrix.postTranslate(app.localBounds.left, app.localBounds.top);

            } else {

                mTmpMatrix.postTranslate(app.position.x, app.position.y);

            }

            mCurrentClipRectF.roundOut(crop);

            if (mSupportsRoundedCornersOnWindows) {

                if (params.getCornerRadius() > -1) {

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

+0 −4
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.quickstep.util;



import static android.view.Surface.ROTATION_0;



import static com.android.launcher3.states.RotationHelper.deltaRotation;

import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE;

import static com.android.quickstep.util.RecentsOrientedState.postDisplayRotation;
@@ -130,8 +128,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 
        mThumbnailData.windowingMode = WINDOWING_MODE_FULLSCREEN;



        mThumbnailPosition.set(runningTarget.screenSpaceBounds);

        // TODO: Should sourceContainerBounds already have this offset?

        mThumbnailPosition.offset(-mRunningTarget.position.x, -mRunningTarget.position.y);

        mLayoutValid = false;

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc 
            } else {

                setThumbnailRotation(deltaRotate, thumbnailInsets, scale, thumbnailPosition);

            }

            mMatrix.postTranslate(-thumbnailPosition.left, -thumbnailPosition.top);



            final float widthWithInsets;

            final float heightWithInsets;