Merge "Remove unused variables in FullscreenDrawParams and PreviewPositionHelper" into main (2b9b1532) · Commits · e / os / BlissLauncher3

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -343,8 +343,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
		boolean isRtlEnabled = !mIsRecentsRtl;
		mPositionHelper.updateThumbnailMatrix(
		mThumbnailPosition, mThumbnailData, mTaskRect.width(), mTaskRect.height(),
		mDp.widthPx, mDp.heightPx, mDp.taskbarHeight, mDp.isTablet,
		mOrientationState.getRecentsActivityRotation(), isRtlEnabled);
		mDp.isTablet, mOrientationState.getRecentsActivityRotation(), isRtlEnabled);
		mPositionHelper.getMatrix().invert(mInversePositionMatrix);
		if (DEBUG) {
		Log.d(TAG, " taskRect: " + mTaskRect);
		@@ -353,7 +352,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {

		float fullScreenProgress = Utilities.boundToRange(this.fullScreenProgress.value, 0, 1);
		mCurrentFullscreenParams.setProgress(fullScreenProgress, recentsViewScale.value,
		/* taskViewScale= */1f, mTaskRect.width(), mDp, mPositionHelper);
		/* taskViewScale= */1f);

		// Apply thumbnail matrix
		float taskWidth = mTaskRect.width();

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -499,8 +499,7 @@ public class DesktopTaskView extends TaskView {
		for (int i = 0; i < mSnapshotViewMap.size(); i++) {
		if (i == 0) {
		// All snapshots share the same params. Only update it with the first snapshot.
		updateFullscreenParams(mSnapshotDrawParams,
		mSnapshotView.getPreviewPositionHelper());
		updateFullscreenParams(mSnapshotDrawParams);
		}
		mSnapshotViewMap.valueAt(i).setFullscreenParams(mSnapshotDrawParams);
		}

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -558,13 +558,12 @@ public class TaskThumbnailView extends View {
		.getRecentsActivityRotation();
		boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
		mPreviewPositionHelper.updateThumbnailMatrix(mPreviewRect, mThumbnailData,
		getMeasuredWidth(), getMeasuredHeight(), dp.widthPx, dp.heightPx,
		dp.taskbarHeight, dp.isTablet, currentRotation, isRtl);
		getMeasuredWidth(), getMeasuredHeight(), dp.isTablet, currentRotation, isRtl);

		mBitmapShader.setLocalMatrix(mPreviewPositionHelper.getMatrix());
		mPaint.setShader(mBitmapShader);
		}
		getTaskView().updateCurrentFullscreenParams(mPreviewPositionHelper);
		getTaskView().updateCurrentFullscreenParams();
		invalidate();
		}

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@ import com.android.quickstep.util.TaskRemovedDuringLaunchListener;
		import com.android.quickstep.util.TransformParams;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.recents.model.ThumbnailData;
		import com.android.systemui.shared.recents.utilities.PreviewPositionHelper;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.QuickStepContract;

		@@ -1708,21 +1707,20 @@ public class TaskView extends FrameLayout implements Reusable {
		}

		protected void updateSnapshotRadius() {
		updateCurrentFullscreenParams(mSnapshotView.getPreviewPositionHelper());
		updateCurrentFullscreenParams();
		mSnapshotView.setFullscreenParams(mCurrentFullscreenParams);
		}

		void updateCurrentFullscreenParams(PreviewPositionHelper previewPositionHelper) {
		updateFullscreenParams(mCurrentFullscreenParams, previewPositionHelper);
		void updateCurrentFullscreenParams() {
		updateFullscreenParams(mCurrentFullscreenParams);
		}

		protected void updateFullscreenParams(TaskView.FullscreenDrawParams fullscreenParams,
		PreviewPositionHelper previewPositionHelper) {
		protected void updateFullscreenParams(TaskView.FullscreenDrawParams fullscreenParams) {
		if (getRecentsView() == null) {
		return;
		}
		fullscreenParams.setProgress(mFullscreenProgress, getRecentsView().getScaleX(),
		getScaleX(), getWidth(), mActivity.getDeviceProfile(), previewPositionHelper);
		getScaleX());
		}

		/**
		@@ -1893,8 +1891,7 @@ public class TaskView extends FrameLayout implements Reusable {
		/**
		* Sets the progress in range [0, 1]
		*/
		public void setProgress(float fullscreenProgress, float parentScale, float taskViewScale,
		int previewWidth, DeviceProfile dp, PreviewPositionHelper pph) {
		public void setProgress(float fullscreenProgress, float parentScale, float taskViewScale) {
		mCurrentDrawnCornerRadius =
		Utilities.mapRange(fullscreenProgress, mCornerRadius, mWindowCornerRadius)
		/ parentScale / taskViewScale;

quickstep/tests/src/com/android/quickstep/FullscreenDrawParamsTest.kt

+7 −111

Original line number	Diff line number	Diff line
		@@ -16,17 +16,13 @@
		package com.android.quickstep

		import android.content.Context
		import android.graphics.Rect
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.launcher3.FakeInvariantDeviceProfileTest
		import com.android.quickstep.util.TaskCornerRadius
		import com.android.quickstep.views.TaskView.FullscreenDrawParams
		import com.android.systemui.shared.recents.model.ThumbnailData
		import com.android.systemui.shared.recents.utilities.PreviewPositionHelper
		import com.android.systemui.shared.system.QuickStepContract
		import com.google.common.truth.Truth.assertThat
		import kotlin.math.roundToInt
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -39,10 +35,6 @@ import org.mockito.Mockito.spy
		@RunWith(AndroidJUnit4::class)
		class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {

		private val TASK_SCALE = 0.7f
		private var mThumbnailData: ThumbnailData = mock(ThumbnailData::class.java)

		private val mPreviewPositionHelper = PreviewPositionHelper()
		private lateinit var params: FullscreenDrawParams

		@Before
		@@ -53,32 +45,11 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		@Test
		fun setStartProgress_correctCornerRadiusForTablet() {
		initializeVarsForTablet()
		val dp = newDP()
		val previewRect = Rect(0, 0, 100, 100)
		val canvasWidth = (dp.widthPx * TASK_SCALE).roundToInt()
		val canvasHeight = (dp.heightPx * TASK_SCALE).roundToInt()
		val currentRotation = 0
		val isRtl = false

		mPreviewPositionHelper.updateThumbnailMatrix(
		previewRect,
		mThumbnailData,
		canvasWidth,
		canvasHeight,
		dp.widthPx,
		dp.heightPx,
		dp.taskbarHeight,
		dp.isTablet,
		currentRotation,
		isRtl
		)
		params.setProgress(
		/* fullscreenProgress= */ 0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* previewWidth= */ 0,
		dp,
		mPreviewPositionHelper
		/* taskViewScale= */ 1.0f
		)

		val expectedRadius = TaskCornerRadius.get(context)
		@@ -88,32 +59,11 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		@Test
		fun setFullProgress_correctCornerRadiusForTablet() {
		initializeVarsForTablet()
		val dp = newDP()
		val previewRect = Rect(0, 0, 100, 100)
		val canvasWidth = (dp.widthPx * TASK_SCALE).roundToInt()
		val canvasHeight = (dp.heightPx * TASK_SCALE).roundToInt()
		val currentRotation = 0
		val isRtl = false

		mPreviewPositionHelper.updateThumbnailMatrix(
		previewRect,
		mThumbnailData,
		canvasWidth,
		canvasHeight,
		dp.widthPx,
		dp.heightPx,
		dp.taskbarHeight,
		dp.isTablet,
		currentRotation,
		isRtl
		)
		params.setProgress(
		/* fullscreenProgress= */ 1.0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* previewWidth= */ 0,
		dp,
		mPreviewPositionHelper
		/* taskViewScale= */ 1.0f
		)

		val expectedRadius = QuickStepContract.getWindowCornerRadius(context)
		@@ -123,32 +73,11 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		@Test
		fun setStartProgress_correctCornerRadiusForPhone() {
		initializeVarsForPhone()
		val dp = newDP()
		val previewRect = Rect(0, 0, 100, 100)
		val canvasWidth = (dp.widthPx * TASK_SCALE).roundToInt()
		val canvasHeight = (dp.heightPx * TASK_SCALE).roundToInt()
		val currentRotation = 0
		val isRtl = false

		mPreviewPositionHelper.updateThumbnailMatrix(
		previewRect,
		mThumbnailData,
		canvasWidth,
		canvasHeight,
		dp.widthPx,
		dp.heightPx,
		dp.taskbarHeight,
		dp.isTablet,
		currentRotation,
		isRtl
		)
		params.setProgress(
		/* fullscreenProgress= */ 0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* previewWidth= */ 0,
		dp,
		mPreviewPositionHelper
		/* taskViewScale= */ 1.0f
		)

		val expectedRadius = TaskCornerRadius.get(context)
		@@ -158,32 +87,11 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		@Test
		fun setFullProgress_correctCornerRadiusForPhone() {
		initializeVarsForPhone()
		val dp = newDP()
		val previewRect = Rect(0, 0, 100, 100)
		val canvasWidth = (dp.widthPx * TASK_SCALE).roundToInt()
		val canvasHeight = (dp.heightPx * TASK_SCALE).roundToInt()
		val currentRotation = 0
		val isRtl = false

		mPreviewPositionHelper.updateThumbnailMatrix(
		previewRect,
		mThumbnailData,
		canvasWidth,
		canvasHeight,
		dp.widthPx,
		dp.heightPx,
		dp.taskbarHeight,
		dp.isTablet,
		currentRotation,
		isRtl
		)
		params.setProgress(
		/* fullscreenProgress= */ 1.0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* previewWidth= */ 0,
		dp,
		mPreviewPositionHelper
		/* taskViewScale= */ 1.0f
		)

		val expectedRadius = QuickStepContract.getWindowCornerRadius(context)
		@@ -207,10 +115,7 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		spyParams.setProgress(
		/* fullscreenProgress= */ 0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* unused previewWidth= */ -1,
		/* unusedDp= */ null,
		/* unused previewPositionHelper= */ null
		/* taskViewScale= */ 1.0f
		)
		assertThat(spyParams.mCurrentDrawnCornerRadius).isEqualTo(display1TaskRadius)

		@@ -218,10 +123,7 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		spyParams.setProgress(
		/* fullscreenProgress= */ 0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* unused previewWidth= */ -1,
		/* unusedDp= */ null,
		/* unused previewPositionHelper= */ null
		/* taskViewScale= */ 1.0f
		)
		assertThat(spyParams.mCurrentDrawnCornerRadius).isEqualTo(display2TaskRadius)
		}
		@@ -243,10 +145,7 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		spyParams.setProgress(
		/* fullscreenProgress= */ 1.0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* unused previewWidth= */ -1,
		/* unusedDp= */ null,
		/* unused previewPositionHelper= */ null
		/* taskViewScale= */ 1.0f
		)
		assertThat(spyParams.mCurrentDrawnCornerRadius).isEqualTo(display1WindowRadius)

		@@ -255,9 +154,6 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() {
		/* fullscreenProgress= */ 1.0f,
		/* parentScale= */ 1.0f,
		/* taskViewScale= */ 1.0f,
		/* unused previewWidth= */ -1,
		/* unusedDp= */ null,
		/* unused previewPositionHelper= */ null
		)
		assertThat(spyParams.mCurrentDrawnCornerRadius).isEqualTo(display2WindowRadius)
		}