If notifications can scroll at all, allow scroll up to status bar

Fixes: 190748504

Test: 1 notif => no scroll
Test: 2 notifs, just enough to scroll => scrolls up to status bar
Test: no scrollRange regressions with
- enough notifs to scroll up and cover qs completely
- inline reply to show IME

Change-Id: I8d2215d841b52df21a45293a23e7aff09b39c7ae

1 files changed, 3 insertions, 0 deletions

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 c640714321b7..ba2f555f7929 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
@@ -2073,6 +2073,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
         int scrollRange = Math.max(0, contentHeight - mMaxLayoutHeight);
         int imeInset = getImeInset();
         scrollRange += Math.min(imeInset, Math.max(0, contentHeight - (getHeight() - imeInset)));
+        if (scrollRange > 0) {
+            scrollRange = Math.max(getScrollAmountToScrollBoundary(), scrollRange);
+        }
         return scrollRange;
     }