diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-17 22:25:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-17 22:25:42 +0000 |
commit | 7c278b62f97d6218d3647c13d0216c9a67deb2ba (patch) | |
tree | c32546aec001781ee4d8365ac0ba698dc29bf2f5 | |
parent | 24200e2757323e6a138170138a204cadcb2bc51c (diff) | |
parent | 921da74c649084e5adec8b1c1ada7f20da517597 (diff) | |
download | android_packages_apps_Trebuchet-7c278b62f97d6218d3647c13d0216c9a67deb2ba.tar.gz android_packages_apps_Trebuchet-7c278b62f97d6218d3647c13d0216c9a67deb2ba.tar.bz2 android_packages_apps_Trebuchet-7c278b62f97d6218d3647c13d0216c9a67deb2ba.zip |
Merge "Continue using window's sysui flags if task thumbnail unavailable" into ub-launcher3-qt-dev
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 0773904d0..d69262e2c 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -698,12 +698,15 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> private void updateSysUiFlags(float windowProgress) { if (mRecentsView != null) { + TaskView centermostTask = mRecentsView.getTaskViewAt(mRecentsView + .getPageNearestToCenterOfScreen()); + int centermostTaskFlags = centermostTask == null ? 0 + : centermostTask.getThumbnail().getSysUiStatusNavFlags(); + boolean useHomeScreenFlags = windowProgress > 1 - UPDATE_SYSUI_FLAGS_THRESHOLD; // We will handle the sysui flags based on the centermost task view. - mRecentsAnimationWrapper.setWindowThresholdCrossed(true); - int sysuiFlags = windowProgress > 1 - UPDATE_SYSUI_FLAGS_THRESHOLD - ? 0 - : mRecentsView.getTaskViewAt(mRecentsView.getPageNearestToCenterOfScreen()) - .getThumbnail().getSysUiStatusNavFlags(); + mRecentsAnimationWrapper.setWindowThresholdCrossed(centermostTaskFlags != 0 + || useHomeScreenFlags); + int sysuiFlags = useHomeScreenFlags ? 0 : centermostTaskFlags; mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, sysuiFlags); } } |