| commit | b9958da552dd119314dcdba54e33085db576773c | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Fri Mar 20 18:22:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 20 18:22:26 2020 +0000 |
| tree | 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8 | |
| parent | 9b25ccdb41642e84dbcb8863cd9ab3ea5473b691 [diff] | |
| parent | 39cbf97f641bd80ef8cc431cfd3f2a1807f1ef26 [diff] |
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 Change-Id: Ie7fb82c4def54620b2ca22714a7fa83a2afe515e
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);