diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-06-22 23:10:24 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-06-22 23:10:24 +0000 |
commit | 911f9257aac6353c8f12a0e2bc1a4710e2c7ce8f (patch) | |
tree | ea080f0d16c24fae4d02e2c3cc0e1a914190930e /quickstep | |
parent | 7460b0cf75f640ec2bddafd6e55487e59b193637 (diff) | |
parent | 26f02037cdc3302b93ccfcf3edd5f3fa0ce1db61 (diff) | |
download | android_packages_apps_Trebuchet-911f9257aac6353c8f12a0e2bc1a4710e2c7ce8f.tar.gz android_packages_apps_Trebuchet-911f9257aac6353c8f12a0e2bc1a4710e2c7ce8f.tar.bz2 android_packages_apps_Trebuchet-911f9257aac6353c8f12a0e2bc1a4710e2c7ce8f.zip |
[automerger] Invoking splitscreen takes snapshot of task without scrim am: 26f02037cd
Change-Id: I91eb9037fb7b4e601c8d6edb3be7944e7f8b5d84
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/src/com/android/quickstep/TaskSystemShortcut.java | 5 | ||||
-rw-r--r-- | quickstep/src/com/android/quickstep/views/TaskThumbnailView.java | 4 |
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; |