Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59c4fff6 authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge "Include taskbar cropped insets in thumbnail aspect ratio difference... 

Merge "Include taskbar cropped insets in thumbnail aspect ratio difference calculation." into tm-qpr-dev
parents 538281db 0333ec1d

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

+0 −1
Original line number Diff line number Diff line
@@ -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,

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

+3 −2
Original line number Diff line number Diff line
@@ -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(),