From f2cd2f7748b37900f20ae083c7628e232b2debc3 Mon Sep 17 00:00:00 2001 From: Zak Cohen Date: Thu, 28 Apr 2022 17:50:16 -0700 Subject: [PATCH] Update TaskOverlay corner radius as fullscreen parameters are updated. Bug: 230470826 Test: Build and run Change-Id: I3b6914bf7423ec60d28d2d06ee5225de1b6862c1 --- quickstep/src/com/android/quickstep/TaskOverlayFactory.java | 4 ++++ .../src/com/android/quickstep/views/TaskThumbnailView.java | 1 + quickstep/src/com/android/quickstep/views/TaskView.java | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index 2d1f17c924..4a3e92aa71 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -316,6 +316,10 @@ public class TaskOverlayFactory implements ResourceBasedOverride { Toast.LENGTH_LONG).show(); } + /** Called when the snapshot has updated its full screen drawing parameters. */ + public void setFullscreenParams(TaskView.FullscreenDrawParams fullscreenParams) { + } + private class ScreenshotSystemShortcut extends SystemShortcut { private final BaseDraggingActivity mActivity; diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java index bff86512f9..d8120ff255 100644 --- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java @@ -283,6 +283,7 @@ public class TaskThumbnailView extends View { public void setFullscreenParams(TaskView.FullscreenDrawParams fullscreenParams) { mFullscreenParams = fullscreenParams; + getTaskOverlay().setFullscreenParams(fullscreenParams); invalidate(); } diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 9c5c643f29..e433615d70 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -20,7 +20,6 @@ import static android.view.Display.DEFAULT_DISPLAY; import static android.widget.Toast.LENGTH_SHORT; import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU; -import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT; import static com.android.launcher3.Utilities.comp; import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor; import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL; @@ -1026,7 +1025,7 @@ public class TaskView extends FrameLayout implements Reusable { } public float getTaskCornerRadius() { - return TaskCornerRadius.get(mActivity); + return mCurrentFullscreenParams.mCornerRadius; } @Override