| commit | f3d81b0a1c411c5dd4e9b457fd31a3084cac1a16 | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Wed Mar 23 16:06:37 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 23 16:06:37 2022 +0000 |
| tree | eef79ac4be848ceeb5e13e236d6c8308c940a0f7 | |
| parent | aa2f879c5591949f65c6a087cd72081a2bd24b50 [diff] | |
| parent | 67bc75a8a923feb85560c29bcbdd6b237f66e238 [diff] |
Merge "Fix thumbnail disappearing during staged split animation" into tm-dev
diff --git a/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java index 98e50f6..d869fed 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java
@@ -62,6 +62,7 @@ // Scale down the bitmap to fix x, and crop in y. float scale = 1.0f * getMeasuredWidth() / mBitmap.getWidth(); + mMatrix.reset(); mMatrix.postScale(scale, scale); mBitmapShader.setLocalMatrix(mMatrix);
diff --git a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java index 93a3a9f..fe5e1d0 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java
@@ -91,6 +91,8 @@ // Copy bounds of exiting thumbnail into ImageView mThumbnailView.setThumbnail(thumbnail); + mThumbnailView.setVisibility(VISIBLE); + RecentsView recentsView = launcher.getOverviewPanel(); mOrientationHandler = recentsView.getPagedOrientationHandler(); mSplitPlaceholderView.setIcon(icon,