From 928b3989b627e2745b337fd77a3eb9673aa8fafc Mon Sep 17 00:00:00 2001 From: mattsziklay Date: Thu, 21 Nov 2024 03:38:56 -0800 Subject: [PATCH] Implement cancel transition on tapping floating view. Cancels split select when tapping the floating task view created from the desktop split select transition, similar to other implementations of split select. Bug: 368631327 Test: Manual Flag: EXEMPT bugfix Change-Id: Ib83de3a5ff95a35627b7fac115d4e4566ec79e40 --- .../android/quickstep/util/SplitSelectStateController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index d35a36aaea..1eb91ae047 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -106,6 +106,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.function.Consumer; /** @@ -941,6 +942,10 @@ public class SplitSelectStateController { mLauncher, mLauncher.getDragLayer(), null /* thumbnail */, mAppIcon, new RectF()); + floatingTaskView.setOnClickListener(view -> + getSplitAnimationController() + .playAnimPlaceholderToFullscreen(mContainer, view, + Optional.of(() -> resetState()))); floatingTaskView.setAlpha(1); floatingTaskView.addStagingAnimation(anim, mTaskBounds, mTempRect, false /* fadeWithThumbnail */, true /* isStagedTask */);