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

Commit 84475949 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Make the cutout slightly smaller am: bb594548 

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

Change-Id: I188f12654814e0fed060dd1156638c4088ea9138
parents ed93efc2 bb594548

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

+12 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.quickstep.views; 
import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;

import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;



import static com.android.launcher3.Utilities.comp;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
@@ -290,8 +291,17 @@ public class TaskThumbnailView extends View { 
            float cornerRadius) {

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            if (mTask != null && getTaskView().isRunningTask() && !getTaskView().showScreenshot()) {

                canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mClearPaint);

                canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius,

                // TODO(b/189265196): Temporary fix to align the surface with the cutout perfectly.

                // Round up only when the live tile task is displayed in Overview.

                float rounding = comp(mFullscreenParams.mFullscreenProgress);

                float left = x + rounding / 2;

                float top = y + rounding / 2;

                float right = width - rounding;

                float bottom = height - rounding;



                canvas.drawRoundRect(left, top, right, bottom, cornerRadius, cornerRadius,

                        mClearPaint);

                canvas.drawRoundRect(left, top, right, bottom, cornerRadius, cornerRadius,

                        mDimmingPaintAfterClearing);

                return;

            }

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

+3 −0
Original line number Diff line number Diff line
@@ -1531,6 +1531,7 @@ public class TaskView extends FrameLayout implements Reusable { 
        private final float mCornerRadius;

        private final float mWindowCornerRadius;



        public float mFullscreenProgress;

        public RectF mCurrentDrawnInsets = new RectF();

        public float mCurrentDrawnCornerRadius;

        /** The current scale we apply to the thumbnail to adjust for new left/right insets. */
@@ -1548,6 +1549,8 @@ public class TaskView extends FrameLayout implements Reusable { 
         */

        public void setProgress(float fullscreenProgress, float parentScale, float taskViewScale,

                int previewWidth, DeviceProfile dp, PreviewPositionHelper pph) {

            mFullscreenProgress = fullscreenProgress;



            RectF insets = pph.getInsetsToDrawInFullscreen(dp);



            float currentInsetsLeft = insets.left * fullscreenProgress;