Merge "Include taskbar cropped insets in thumbnail aspect ratio difference calculation." into tm-qpr-dev am: 59c4fff67c

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

Change-Id: Id044d04b165d334931afb3cfc3754c5b4e0f4abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pat Manning
2022-12-13 18:59:11 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 3 deletions

View File

@@ -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,

View File

@@ -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(),