Merge "Provide content insets while in SUW in portrait mode" into tm-dev am: 7e426a3933

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17073451

Change-Id: I90e5d1cb6e92228605cc379ce54cbab5a82504ca

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

@@ -29,6 +29,7 @@ import android.annotation.Nullable;
 import android.content.SharedPreferences;
 import android.view.ViewConfiguration;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.quickstep.AnimatedFloat;
@@ -257,6 +258,13 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
      */
     public int getContentHeightToReportToApps() {
         if (supportsVisualStashing() && hasAnyFlag(FLAGS_REPORT_STASHED_INSETS_TO_APP)) {
+            DeviceProfile dp = mActivity.getDeviceProfile();
+            if (hasAnyFlag(FLAG_STASHED_IN_APP_SETUP) && dp.isTaskbarPresent && !dp.isLandscape) {
+                // 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.  For now,
+                // just inset by the bar height.
+                return mUnstashedHeight;
+            }
             boolean isAnimating = mAnimator != null && mAnimator.isStarted();
             return mControllers.stashedHandleViewController.isStashedHandleVisible() || isAnimating
                     ? mStashedHeight : 0;