commit 2bede2dbf2c54b6f70ba97f96725f3f6ea697ef8
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 01 20:06:56 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 01 20:06:56 2021 +0000
tree 61286ea64a867ddbc8a4d1df68700e891cd6f578
parent 87f010f3bd4fce65687b6d08dfc4cc786f3c3102
parent e81af3570b55f522ad09c4a13701352c3ab28ded

Merge "Animate right icon of app pair" into sc-v2-dev

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

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());
+    }
 }

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

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;
         }