From 62c4711b0e48c26dba6f196006b75f0971d3029c Mon Sep 17 00:00:00 2001 From: Zak Cohen Date: Tue, 19 May 2020 11:42:49 -0700 Subject: [PATCH] Overview Actions - use scaled insets for screenshot transition. The actual task insets aren't used for display, so to make the transition line up, use scaled ones. Bug: 154524544 Test: local Change-Id: I0f484e6dbf13a558c042f84aa68f1d6e9c23b328 --- .../android/quickstep/TaskOverlayFactory.java | 9 +++-- .../quickstep/views/TaskThumbnailView.java | 36 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java index 3cfff7e958..97cd11b4f5 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java @@ -18,12 +18,16 @@ package com.android.quickstep; import static com.android.launcher3.util.MainThreadInitializedObject.forOverride; +import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Insets; import android.graphics.Matrix; import android.graphics.Rect; +import android.os.Build; import android.widget.Toast; +import androidx.annotation.RequiresApi; + import com.android.launcher3.BaseActivity; import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.R; @@ -122,6 +126,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride { } } + @SuppressLint("NewApi") @Override public void onScreenshot() { if (isAllowedByPolicy) { @@ -159,9 +164,9 @@ public class TaskOverlayFactory implements ResourceBasedOverride { * * @return the insets in screen coordinates. */ + @RequiresApi(api = Build.VERSION_CODES.Q) public Insets getTaskSnapshotInsets() { - // TODO: return the real insets - return Insets.of(0, 0, 0, 0); + return mThumbnailView.getScaledInsets(); } private void showBlockedByPolicyMessage() { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java index ead0c8b909..a371dd21ff 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java @@ -27,6 +27,7 @@ import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.ColorMatrix; import android.graphics.ColorMatrixColorFilter; +import android.graphics.Insets; import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.PorterDuff; @@ -34,12 +35,15 @@ import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Shader; +import android.os.Build; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.Property; import android.view.Surface; import android.view.View; +import androidx.annotation.RequiresApi; + import com.android.launcher3.BaseActivity; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; @@ -211,6 +215,38 @@ public class TaskThumbnailView extends View implements PluginListener