Merge "Include taskbar cropped insets in thumbnail aspect ratio difference calculation." into tm-qpr-dev
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 44ad889..04af19f 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -320,7 +320,6 @@
// 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 ab1198a..f6e172a 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -414,7 +414,9 @@
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 @@
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(),