From ecded08ddd30083ec36e2c11e8379463ee0974a7 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Mon, 3 Apr 2023 20:10:12 -0400
Subject: [PATCH] Dispatch insets from overlay drag layer.

This simplifies insets handling for All Apps and EDU, and also fixes
some edge cases with All Apps popup menus. KeyboardQuickSwitchView now
needs to ignore insets since it has a hardcoded top margin,
keyboard_quick_switch_margin_top.

Fix: 276804708
Test: All Apps, EDU, and Quick Switch all have proper insets handling.
Change-Id: I93237a057b4f9ae62f71a70c59a58f3c8401c102
---
 quickstep/res/layout/keyboard_quick_switch_view.xml        | 3 ++-
 quickstep/res/layout/taskbar_edu_tooltip.xml               | 1 -
 .../taskbar/allapps/TaskbarAllAppsContainerView.java       | 7 -------
 .../launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java | 4 +++-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/quickstep/res/layout/keyboard_quick_switch_view.xml b/quickstep/res/layout/keyboard_quick_switch_view.xml
index 5c20a2db3c..64d3f67eda 100644
--- a/quickstep/res/layout/keyboard_quick_switch_view.xml
+++ b/quickstep/res/layout/keyboard_quick_switch_view.xml
@@ -25,7 +25,8 @@
     android:clipToOutline="true"
     android:alpha="0"
     android:visibility="invisible"
-    android:focusableInTouchMode="true">
+    android:focusableInTouchMode="true"
+    app:layout_ignoreInsets="true">
 
     <HorizontalScrollView
         android:id="@+id/scroll_view"
diff --git a/quickstep/res/layout/taskbar_edu_tooltip.xml b/quickstep/res/layout/taskbar_edu_tooltip.xml
index 3fcd713147..657066c108 100644
--- a/quickstep/res/layout/taskbar_edu_tooltip.xml
+++ b/quickstep/res/layout/taskbar_edu_tooltip.xml
@@ -20,7 +20,6 @@
     android:layout_marginBottom="16dp"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:fitsSystemWindows="true"
     android:focusable="true"
     android:importantForAccessibility="yes"
     android:gravity="center"
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java
index 7f6d78a420..29f233e3dc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java
@@ -18,7 +18,6 @@ package com.android.launcher3.taskbar.allapps;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.WindowInsets;
 
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.ActivityAllAppsContainerView;
@@ -36,12 +35,6 @@ public class TaskbarAllAppsContainerView extends
         super(context, attrs, defStyleAttr);
     }
 
-    @Override
-    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
-        return super.onApplyWindowInsets(insets);
-    }
-
     @Override
     protected View inflateSearchBox() {
         // Remove top padding of header, since we do not have any search
diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
index ec64128c91..2c3e1ac28a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
@@ -120,7 +120,9 @@ public class TaskbarOverlayDragLayer extends
 
     @Override
     public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        return updateInsetsDueToStashing(insets);
+        insets = updateInsetsDueToStashing(insets);
+        setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
+        return insets;
     }
 
     @Override