| commit | b99fd2e490303ffd5e6a61521566827c9e3494af | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Aug 12 00:45:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 12 00:45:22 2021 +0000 |
| tree | a92ffde6d73a643166829d0735746a4985af8146 | |
| parent | 3bb9cdedea3f533bdadd403eb9005886d94d786b [diff] | |
| parent | 4b3c24d0d3c3b4f9de68ed5d507e6fc498f657e5 [diff] |
Merge "Adjust all apps zoom level" into sc-dev am: 6b10f4649c am: 4b3c24d0d3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15530106 Change-Id: Ie5210a9f9fdf4ccf30e3dd01d5d07549d9880508
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);