| commit | eba2a6aa8ad175c6e12fe5a68b57faf97edabcb9 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Dec 01 20:47:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 01 20:47:12 2021 +0000 |
| tree | 4ba29ad0d11df89298411b2a7a1757a9b91d0e8c | |
| parent | b7323164bf8b70bc62abc710dba25fad68726e44 [diff] | |
| parent | 64b80cb75d949b884ddb54002c50824f8802806b [diff] |
Merge "Animate right icon of app pair" into sc-v2-dev am: 2bede2dbf2 am: 64b80cb75d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16371722 Change-Id: I336948ccd6ada2c96a12d5deb9213e740595c6de
diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java index b43626b..9311261 100644 --- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java +++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
@@ -258,4 +258,10 @@ super.updateSnapshotRadius(); mSnapshotView2.setFullscreenParams(mCurrentFullscreenParams); } + + @Override + protected void setIconAndDimTransitionProgress(float progress, boolean invert) { + super.setIconAndDimTransitionProgress(progress, invert); + mIconView2.setAlpha(mIconView.getAlpha()); + } }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index f7f5efc..467d225 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -912,7 +912,7 @@ return deviceProfile.overviewShowAsGrid && !isFocusedTask(); } - private void setIconAndDimTransitionProgress(float progress, boolean invert) { + protected void setIconAndDimTransitionProgress(float progress, boolean invert) { if (invert) { progress = 1 - progress; }