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

Commit 7bc2db80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update corner radius of both snapshot in app pair" into sc-v2-dev am: 916873e7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16240047

Change-Id: Ie8f920e85a72dc79d024fd3407180a89ff99626a
parents 7f3e32ed 916873e7

quickstep/src/com/android/quickstep/views/GroupedTaskView.java

+6 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.R;

import com.android.launcher3.util.RunnableList;

import com.android.launcher3.util.SplitConfigurationOptions;

import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds;

import com.android.launcher3.util.TransformingTouchDelegate;

import com.android.quickstep.RecentsModel;
@@ -241,4 +240,10 @@ public class GroupedTaskView extends TaskView { 
                taskIconHeight, mPrimaryTempRect, mSecondaryTempRect,

                isRtl, deviceProfile, mSplitBoundsConfig);

    }



    @Override

    protected void updateSnapshotRadius() {

        super.updateSnapshotRadius();

        mSnapshotView2.setFullscreenParams(mCurrentFullscreenParams);

    }

}

quickstep/src/com/android/quickstep/views/TaskView.java

+2 −3
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ import com.android.quickstep.TaskThumbnailCache; 
import com.android.quickstep.TaskUtils;

import com.android.quickstep.TaskViewUtils;

import com.android.quickstep.util.CancellableTask;

import com.android.quickstep.util.LauncherSplitScreenListener;

import com.android.quickstep.util.RecentsOrientedState;

import com.android.quickstep.util.TaskCornerRadius;

import com.android.quickstep.util.TransformParams;
@@ -369,7 +368,7 @@ public class TaskView extends FrameLayout implements Reusable { 
    private float mGridProgress;

    private float mNonGridScale = 1;

    private float mDismissScale = 1;

    private final FullscreenDrawParams mCurrentFullscreenParams;

    protected final FullscreenDrawParams mCurrentFullscreenParams;

    protected final StatefulActivity mActivity;



    // Various causes of changing primary translation, which we aggregate to setTranslationX/Y().
@@ -1374,7 +1373,7 @@ public class TaskView extends FrameLayout implements Reusable { 
        invalidateOutline();

    }



    void updateSnapshotRadius() {

    protected void updateSnapshotRadius() {

        updateCurrentFullscreenParams(mSnapshotView.getPreviewPositionHelper());

        mSnapshotView.setFullscreenParams(mCurrentFullscreenParams);

    }