| commit | 64b80cb75d949b884ddb54002c50824f8802806b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Dec 01 20:42:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 01 20:42:18 2021 +0000 |
| tree | d7f84dad3048bb7a2d795c823f3fe921008d8a3a | |
| parent | 8c427dd750edcc9330ba9a6ef3dd7f12f7895f0e [diff] | |
| parent | 2bede2dbf2c54b6f70ba97f96725f3f6ea697ef8 [diff] |
Merge "Animate right icon of app pair" into sc-v2-dev am: 2bede2dbf2 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16371722 Change-Id: Ib04df010c9da0d8c435c1f97ac5cd113de86a73e
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 cca9ecf..8dee4e7 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; }