[DO NOT MERGE] Make the cutout slightly smaller

Temporary fix for S. Leaving the bug open for a proper fix in T.

Bug: 189265196
Test: https://screenshot.googleplex.com/75fgCva736rqwg5
Change-Id: Ice3b189a41f759e090334e360e44543eabc4836d
This commit is contained in:
Tracy Zhou
2021-06-23 15:16:39 -07:00
parent 1fe5fda3d8
commit 26f47c711a
2 changed files with 14 additions and 2 deletions

View File

@@ -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;
@@ -308,8 +309,17 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
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;
}

View File

@@ -1489,6 +1489,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. */
@@ -1506,6 +1507,7 @@ public class TaskView extends FrameLayout implements Reusable {
*/
public void setProgress(float fullscreenProgress, float parentScale, int previewWidth,
DeviceProfile dp, PreviewPositionHelper pph) {
mFullscreenProgress = fullscreenProgress;
RectF insets = pph.getInsetsToDrawInFullscreen();
float currentInsetsLeft = insets.left * fullscreenProgress;