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