commit 6a3a09940fe48a9d62abb453b9e8558e0da06327
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 14 22:43:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 14 22:43:26 2019 +0000
tree b7830952542db233e0113d6857ebdb35a2f51d0a
parent 6c12641bee823b6d1e2d2db5a8cc177fefb5a245
parent 68e01dda46f1dabfbe7ea8252b29f9381326e481

Merge "Fades out Assistant when entering Overview." into ub-launcher3-master

quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java
index 5eee897..24e7f0e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java
@@ -35,10 +35,11 @@
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.RemoteAnimationTargets;
 import com.android.quickstep.SystemUiProxy;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.quickstep.views.TaskView;
@@ -200,6 +201,11 @@
                         }
                         mCurrentCornerRadius = cornerRadius;
                     }
+                    // Fade out Assistant overlay.
+                    if (app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT
+                            && app.isNotInRecents) {
+                        alpha = 1 - Interpolators.DEACCEL_2_5.getInterpolation(progress);
+                    }
                 } else if (params.targetSet.hasRecents) {
                     // If home has a different target then recents, reverse anim the
                     // home target.