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