From 1e49216401f26d2d066224c66ee63976a595972a Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Tue, 10 Aug 2021 17:58:14 -0700 Subject: [PATCH] Do not set user active hints when Shell Transition is on. Previously, we hint at user active in order to let the launcher know at an earlier time that the user is about to go home, to provide PiP a shelf offset. However with Shell Transitions, this is now being done instantly as the launcher activity is resumed right as user touches down on the gesture pill. We then no longer need this for shell transitions. Bug: 165793917 Test: Enable Shell Transitions, go home to enter PIP, and open another app - see that PIP auto moves downward now that shelf height has changed Change-Id: I347c885425ce820a42ebfcc15082862d04aa1a7d --- .../src/com/android/quickstep/LauncherSwipeHandlerV2.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java index 19cad53bb1..3239b0064a 100644 --- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java +++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java @@ -106,7 +106,9 @@ public class LauncherSwipeHandlerV2 extends boolean canUseWorkspaceView = workspaceView != null && workspaceView.isAttachedToWindow(); mActivity.getRootView().setForceHideBackArrow(true); - mActivity.setHintUserWillBeActive(); + if (!TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) { + mActivity.setHintUserWillBeActive(); + } if (!canUseWorkspaceView || appCanEnterPip) { return new LauncherHomeAnimationFactory();