From 8355bc1a760b8a26c203d012ecb44493b3f0c35a Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Thu, 16 May 2024 21:35:44 -0700 Subject: [PATCH] Set inset in phone setup mode to setup inset - In phone setup mode, gesture mode is no button but the inset we report should be setup inset Fixes: 340998601 Test: https://screenshot.googleplex.com/8Q4WHorpUeqWSjw Change-Id: I84d60ecc7179008e80e7b09eda5b3a1abb24e138 (cherry picked from commit b17af6ff7544ff9a93a17c84f82c2d9abba99224) --- .../android/launcher3/taskbar/TaskbarStashController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 102fe2a489..f027392c25 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -426,14 +426,15 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba * @see android.view.WindowInsets.Type#systemBars() */ public int getContentHeightToReportToApps() { - if ((mActivity.isPhoneMode() && !mActivity.isThreeButtonNav()) - || DisplayController.isTransientTaskbar(mActivity)) { + if (mActivity.isUserSetupComplete() && (mActivity.isPhoneGestureNavMode() + || DisplayController.isTransientTaskbar(mActivity))) { return getStashedHeight(); } if (supportsVisualStashing() && hasAnyFlag(FLAGS_REPORT_STASHED_INSETS_TO_APP)) { DeviceProfile dp = mActivity.getDeviceProfile(); - if (hasAnyFlag(FLAG_STASHED_IN_APP_SETUP) && dp.isTaskbarPresent) { + if (hasAnyFlag(FLAG_STASHED_IN_APP_SETUP) && (dp.isTaskbarPresent + || mActivity.isPhoneGestureNavMode())) { // We always show the back button in SUW but in portrait the SUW layout may not // be wide enough to support overlapping the nav bar with its content. // We're sending different res values in portrait vs landscape