summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorTony <twickham@google.com>2019-05-17 18:04:53 -0400
committerTony <twickham@google.com>2019-05-17 18:04:53 -0400
commit921da74c649084e5adec8b1c1ada7f20da517597 (patch)
treede0fe89359e30d0d5422d7c1382825c35f436703 /quickstep
parent3c7f48116c7ac39494ad08bfc06d5259748bef0c (diff)
downloadandroid_packages_apps_Trebuchet-921da74c649084e5adec8b1c1ada7f20da517597.tar.gz
android_packages_apps_Trebuchet-921da74c649084e5adec8b1c1ada7f20da517597.tar.bz2
android_packages_apps_Trebuchet-921da74c649084e5adec8b1c1ada7f20da517597.zip
Continue using window's sysui flags if task thumbnail unavailable
If the centermost task is null or doesn't yet have thumbnail data, don't use its sysui flags - continue using the window we're swiping from instead. Bug: 132898688 Change-Id: I202937d8aa01ee24ef01693d9594c4929e6bd314
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java13
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 f2260d669..c647bb091 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -706,12 +706,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);
}
}