Merge "Invoking splitscreen takes snapshot of task without scrim" into ub-launcher3-edmonton-polish

2 files changed, 9 insertions, 0 deletions

diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index c77d0c7d7..5a6312d4e 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -189,9 +189,14 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
                     final Rect taskBounds = new Rect(position[0], position[1],
                             position[0] + width, position[1] + height);
 
+                    // Take the thumbnail of the task without a scrim and apply it back after
+                    float alpha = thumbnailView.getDimAlpha();
+                    thumbnailView.setDimAlpha(0);
                     Bitmap thumbnail = RecentsTransition.drawViewIntoHardwareBitmap(
                             taskBounds.width(), taskBounds.height(), thumbnailView, 1f,
                             Color.BLACK);
+                    thumbnailView.setDimAlpha(alpha);
+
                     AppTransitionAnimationSpecsFuture future =
                             new AppTransitionAnimationSpecsFuture(mHandler) {
                         @Override
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 07f22aada..fb653cfac 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -161,6 +161,10 @@ public class TaskThumbnailView extends View {
         updateThumbnailPaintFilter();
     }
 
+    public float getDimAlpha() {
+        return mDimAlpha;
+    }
+
     public Rect getInsets() {
         if (mThumbnailData != null) {
             return mThumbnailData.insets;