From 8c51aa85081c515134cfc124444af24a42c00cd3 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Tue, 22 Nov 2022 14:32:07 +0000
Subject: [PATCH] Adjust ime insets for stack scroll layout

This ensures that inline replies are properly displayed with IME, now
that the window will not automatically resize due to the removal of
the LayoutParams.SOFT_INPUT_ADJUST_RESIZE flag.

Test: atest
InputMethodStressTest: com.android.inputmethod.stresstest.NotificationTest
Fixes: 259788831
Change-Id: I3d86786d19f8f1de8da7f7d3f5f0a129919f2a4d
---
 .../notification/stack/NotificationStackScrollLayout.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 44308d5fc6132..073bd4bf302be 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -1809,7 +1809,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
     @Override
     @ShadeViewRefactor(RefactorComponent.COORDINATOR)
     public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        mBottomInset = insets.getSystemWindowInsetBottom();
+        mBottomInset = insets.getSystemWindowInsetBottom()
+                + insets.getInsets(WindowInsets.Type.ime()).bottom;
 
         mWaterfallTopInset = 0;
         final DisplayCutout cutout = insets.getDisplayCutout();