commit e7a49dc915958b0aef9ed0351ca28f448e65fdc0
author Tony Wickham <twickham@google.com> Tue Mar 27 14:46:46 2018 -0700
committer Tony Wickham <twickham@google.com> Tue Mar 27 17:05:10 2018 -0700
tree ba25e8d279ff424f1cb5a385d8c86c608d7f57ca
parent 932d3b02de5e440a186b39abf1c29bd3ba971129

Don't add task overlay when thumbnail is rotated

Change-Id: Ie4088c8c1a1c22a30caddc5bfb6b76e6a42ef088

quickstep/src/com/android/quickstep/views/TaskThumbnailView.java

diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index e443eea..4c8d69f 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -139,6 +139,7 @@
     }
 
     private void updateThumbnailMatrix() {
+        boolean rotate = false;
         if (mBitmapShader != null && mThumbnailData != null) {
             float scale = mThumbnailData.scale;
             float thumbnailWidth = mThumbnailData.thumbnail.getWidth() -
@@ -146,8 +147,6 @@
             float thumbnailHeight = mThumbnailData.thumbnail.getHeight() -
                     (mThumbnailData.insets.top + mThumbnailData.insets.bottom) * scale;
             final float thumbnailScale;
-
-            boolean rotate = false;
             final DeviceProfile profile = BaseActivity.fromContext(getContext())
                     .getDeviceProfile();
             if (getMeasuredWidth() == 0) {
@@ -226,7 +225,12 @@
             mPaint.setShader(shader);
         }
 
-        mOverlay.setTaskInfo(mTask, mThumbnailData, mMatrix);
+        if (rotate) {
+            // The overlay doesn't really work when the screenshot is rotated, so don't add it.
+            mOverlay.reset();
+        } else {
+            mOverlay.setTaskInfo(mTask, mThumbnailData, mMatrix);
+        }
         invalidate();
     }