From 0333ec1d21507eb7bdd007173dd7f7c848847d67 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Tue, 6 Dec 2022 12:22:14 +0000 Subject: [PATCH] Include taskbar cropped insets in thumbnail aspect ratio difference calculation. Bug: 260861673 Test: manual. Change-Id: I3abed4dfab5dccf99ae81e0f2d0ae840a3aabed5 --- .../src/com/android/quickstep/util/TaskViewSimulator.java | 1 - .../src/com/android/quickstep/views/TaskThumbnailView.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java index 44ad889e69..04af19f729 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java @@ -320,7 +320,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { // mIsRecentsRtl is the inverse of TaskView RTL. boolean isRtlEnabled = !mIsRecentsRtl; - mPositionHelper.setTaskbarInApp(mDp.isTaskbarPresentInApps); mPositionHelper.updateThumbnailMatrix( mThumbnailPosition, mThumbnailData, mTaskRect.width(), mTaskRect.height(), mDp.widthPx, mDp.heightPx, mDp.taskbarSize, mDp.isTablet, diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java index ab1198ab7d..f6e172aad0 100644 --- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java @@ -414,7 +414,9 @@ public class TaskThumbnailView extends View { return false; } - float thumbnailViewAspect = getWidth() / (float) getHeight(); + RectF insets = mPreviewPositionHelper.getClippedInsets(); + float thumbnailViewAspect = (getWidth() + insets.left + insets.right) + / (getHeight() + insets.top + insets.bottom); float thumbnailDataAspect = mThumbnailData.thumbnail.getWidth() / (float) mThumbnailData.thumbnail.getHeight(); @@ -465,7 +467,6 @@ public class TaskThumbnailView extends View { private void updateThumbnailMatrix() { DeviceProfile dp = mActivity.getDeviceProfile(); - mPreviewPositionHelper.setTaskbarInApp(dp.isTaskbarPresentInApps); mPreviewPositionHelper.setOrientationChanged(false); if (mBitmapShader != null && mThumbnailData != null) { mPreviewRect.set(0, 0, mThumbnailData.thumbnail.getWidth(),