commit f20a318b2dac88bdb624992d13a5ebef743341e9
author Fabian Kozynski <kozynski@google.com> Tue Oct 02 16:40:34 2018 -0400
committer Fabian Kozynski <kozynski@google.com> Wed Oct 03 08:57:53 2018 -0400
tree d06dd793bf4dea438ca390057a0dbfc68c231c56
parent 75d2c1f13a2a452ccd8096bef591f590e84a126a

Settings panel is expanded correnctly when QQS is showing

Test: runtest && manual
Change-Id: I6f04264cf308e4b2b22ae2ee9d2448737025e3ea
Fixes: 110149988

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 3a4c218..6ea4c92 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -733,7 +733,11 @@
             mQsExpandImmediate = true;
             mNotificationStackScroller.setShouldShowShelfOnly(true);
         }
-        expand(true /* animate */);
+        if (isFullyCollapsed()){
+            expand(true /* animate */);
+        } else {
+            flingSettings(0 /* velocity */, FLING_EXPAND);
+        }
     }
 
     public void expandWithoutQs() {