From f20a318b2dac88bdb624992d13a5ebef743341e9 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Tue, 2 Oct 2018 16:40:34 -0400
Subject: Settings panel is expanded correnctly when QQS is showing

Test: runtest && manual
Change-Id: I6f04264cf308e4b2b22ae2ee9d2448737025e3ea
Fixes: 110149988
---
 .../com/android/systemui/statusbar/phone/NotificationPanelView.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 3a4c218d337e..6ea4c92e4143 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 @@ public class NotificationPanelView extends PanelView implements
             mQsExpandImmediate = true;
             mNotificationStackScroller.setShouldShowShelfOnly(true);
         }
-        expand(true /* animate */);
+        if (isFullyCollapsed()){
+            expand(true /* animate */);
+        } else {
+            flingSettings(0 /* velocity */, FLING_EXPAND);
+        }
     }
 
     public void expandWithoutQs() {
-- 
cgit v1.2.3-59-g8ed1b