| commit | f7eb87cebde0a0f6f67fb83f9bfd4296f96341cd | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Fri Mar 20 18:30:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 20 18:30:25 2020 +0000 |
| tree | 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8 | |
| parent | a8bd501e9f313b2fe03738b9ca123f387009f22b [diff] | |
| parent | 2ddbe4c8afcbcabe0366dcabdaab80b34c0e633f [diff] |
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 2ddbe4c8af Change-Id: I904a49d3149f6388a4906a853eb507eda5af6abb
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);