| commit | 8d6d6da71fb8c8d789c16983ca53634daf776169 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Wed Aug 11 23:57:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 11 23:57:48 2021 +0000 |
| tree | d124112eeae8e02ad91bce093a2c1c92af09ec71 | |
| parent | b2206f3c711563f563c9abfea5a6e4b815cf782c [diff] | |
| parent | 9b6951db38fed41109e8d9c097d18c38d595e874 [diff] |
Fix pending restore widget touch issue am: bdffb53843 am: 9b6951db38 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15517689 Change-Id: I8bcb8f6cc657b24c4bba64e1183ff0a5853c6652
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java index fd44e02..e2f198c 100644 --- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -173,7 +173,9 @@ @Override protected void notifyGestureAnimationStartToRecents() { if (mRunningOverHome) { - mRecentsView.onGestureAnimationStartOnHome(mGestureState.getRunningTask()); + if (SysUINavigationMode.getMode(mContext).hasGestures) { + mRecentsView.onGestureAnimationStartOnHome(mGestureState.getRunningTask()); + } } else { super.notifyGestureAnimationStartToRecents(); }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index ce79125..fa4d6a1 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1775,7 +1775,7 @@ public void onGestureAnimationEnd() { mGestureActive = false; if (mOrientationState.setGestureActive(false)) { - updateOrientationHandler(); + updateOrientationHandler(/* forceRecreateDragLayerControllers = */ false); } setEnableFreeScroll(true);