| commit | 15181b54b0178773c67b750c5d2dc48df00fca39 | [log] [tgz] |
|---|---|---|
| author | Ben Lin <linben@google.com> | Fri Aug 13 10:08:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 10:08:32 2021 +0000 |
| tree | 8defb852ed6c14637ef3ef3558ad6d12c985658f | |
| parent | 05e2828a6a5319634afb9f4e96538a6d3c43f2aa [diff] | |
| parent | c3d09d22c18ba0b109f57a444547c850b52dd927 [diff] |
Merge "Do not set user active hints when Shell Transition is on." into sc-v2-dev am: 99b5d13952 am: c3d09d22c1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15524184 Change-Id: I4025427c229838a0104625a266100fcfc184c066
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();