mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-20 11:18:21 +00:00
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:
@@ -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,
|
||||
|
||||
@@ -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(),
|
||||
|
||||
Reference in New Issue
Block a user