diff options
| author | Andy Wickham <awickham@google.com> | 2019-10-14 23:46:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-14 23:46:32 +0000 |
| commit | bdf1687f57de361b1345bf6547cab22e1cc4623c (patch) | |
| tree | 53a757260871fc82c2c0631a26b97f6bdd175146 | |
| parent | 7a2076e3ab3d08c8f7047cbde1a6b107458e2970 (diff) | |
| parent | fb578e4528855c8a82f0478b1eab9393c4711821 (diff) | |
| download | packages_apps_Trebuchet-bdf1687f57de361b1345bf6547cab22e1cc4623c.tar.gz packages_apps_Trebuchet-bdf1687f57de361b1345bf6547cab22e1cc4623c.tar.bz2 packages_apps_Trebuchet-bdf1687f57de361b1345bf6547cab22e1cc4623c.zip | |
Merge "Fades out Assistant when entering Overview." into ub-launcher3-qt-future-dev
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java index cae273a16..fa3be9c12 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java @@ -37,6 +37,7 @@ 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.RecentsModel; import com.android.quickstep.views.RecentsView; @@ -50,8 +51,6 @@ import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat. import com.android.systemui.shared.system.TransactionCompat; import com.android.systemui.shared.system.WindowManagerWrapper; -import java.util.function.BiFunction; - /** * Utility class to handle window clip animation */ @@ -213,6 +212,11 @@ public class ClipAnimationHelper { } 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 (targetSet.hasRecents) { // If home has a different target then recents, reverse anim the // home target. |