From f45aa98ea1b19e5c1241cfac9733bf3dedca9f87 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 16 Apr 2020 15:22:01 -0400
Subject: [PATCH] Notify expanding state for QS expand method

To alert the NotificationStackScroller of QS expansion so it can animate
appropriately

Test: manual
Fixes: 141655677
Change-Id: I78c8704d7fd2ed6bdc824d3021d2c91c1e049733
---
 .../statusbar/phone/NotificationPanelViewController.java    | 6 ++++++
 .../systemui/statusbar/phone/PanelViewController.java       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
index 31797d1faa612..c9716d39590e0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -1779,8 +1779,14 @@ public class NotificationPanelViewController extends PanelViewController {
             setQsExpansion((Float) animation.getAnimatedValue());
         });
         animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                notifyExpandingStarted();
+            }
+
             @Override
             public void onAnimationEnd(Animator animation) {
+                notifyExpandingFinished();
                 mNotificationStackScroller.resetCheckSnoozeLeavebehind();
                 mQsExpansionAnimator = null;
                 if (onFinishRunnable != null) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
index f7d403f667cbc..81dc9e1cf0e2e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
@@ -157,7 +157,7 @@ public abstract class PanelViewController {
     protected void onExpandingStarted() {
     }
 
-    private void notifyExpandingStarted() {
+    protected void notifyExpandingStarted() {
         if (!mExpanding) {
             mExpanding = true;
             onExpandingStarted();