| commit | 2ddbe4c8afcbcabe0366dcabdaab80b34c0e633f | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Fri Mar 20 18:27:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 20 18:27:37 2020 +0000 |
| tree | adaff9f3c800a3efbcb5bb89594e8e0fa604bd5b | |
| parent | 32f6b1a66d08100330f96eed9ee73abd3864e1cc [diff] | |
| parent | c0eb6269c6f24428bd5951fc1f756e708e63ab63 [diff] |
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 Change-Id: I9efeb5bdcf7d4d6cfd0070a2de69f0f73b54b4ad
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java index 3328abc..4c83820 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -588,7 +588,7 @@ // We will handle the sysui flags based on the centermost task view. if (mRecentsAnimationController != null) { mRecentsAnimationController.setWindowThresholdCrossed(centermostTaskFlags != 0 - || useHomeScreenFlags); + && useHomeScreenFlags); } int sysuiFlags = useHomeScreenFlags ? 0 : centermostTaskFlags; mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, sysuiFlags);