commit 99b5d13952b5ef9ca41da73bd6e1466d4471dc91
author Ben Lin <linben@google.com> Fri Aug 13 01:09:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 13 01:09:19 2021 +0000
tree 48d2a7ba3adc36040987a5bea612a9cd43b2599d
parent 73ad3abc29eee65e587841009db3932fde8f3b3c
parent 1e49216401f26d2d066224c66ee63976a595972a

Merge "Do not set user active hints when Shell Transition is on." into sc-v2-dev

quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java

diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 19cad53..3239b00 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -106,7 +106,9 @@
         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();