From 669b9c5c30181b3ae171d9e336848c8390fbe270 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 5 Jun 2024 17:37:02 +0000
Subject: [PATCH] Always report mandatory insets for button nav

Fixes: 340134342
Fixes: 343817842
Test: atest android.systemui.cts.WindowInsetsBehaviorTests
Test: Verify mandatory insets vs window bounds in various
      orientations when folded/unfolded
Change-Id: I18d4f5d212d16c62d15d84b4842b3d20c0d8c5ae
Merged-In: I18d4f5d212d16c62d15d84b4842b3d20c0d8c5ae
(cherry picked from commit 762b3b4685225cbb2b106ac2c82ced50e19404cc)
---
 .../com/android/launcher3/taskbar/TaskbarInsetsController.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt
index 4f511c1bfd..175306a574 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt
@@ -223,7 +223,8 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas
             provider.insetsSize = getInsetsForGravityWithCutout(contentHeight, gravity, endRotation)
         } else if (provider.type == mandatorySystemGestures()) {
             if (context.isThreeButtonNav) {
-                provider.insetsSize = Insets.of(0, 0, 0, 0)
+                provider.insetsSize = getInsetsForGravityWithCutout(contentHeight, gravity,
+                    endRotation)
             } else {
                 val gestureHeight =
                         ResourceUtils.getNavbarSize(