From 68e01dda46f1dabfbe7ea8252b29f9381326e481 Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Mon, 14 Oct 2019 15:31:34 -0700 Subject: [PATCH] Fades out Assistant when entering Overview. This makes the transition smoother, since the Assistant goes away at the end of it. Note this only applies to the transition while an app other than Launcher is live. Before: https://drive.google.com/open?id=18SOWTtTUzt19TReAYnofQLIShJ2I-odP After: https://drive.google.com/open?id=1hqsikXSlCnSvNg0ZQYHxP-OIbS5yt9aW Bug: 136282913 Change-Id: Ia53c2407c82725c776f27b0d6e80a34554b4a303 Tested: Manually --- .../quickstep/util/AppWindowAnimationHelper.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 5eee897350..24e7f0ecea 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.BaseDraggingActivity; 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 @@ public class AppWindowAnimationHelper { } 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.