Merge "Fix QS not collapsing after some QQS gestures" into nyc-dev

am: 12b1776dde

* commit '12b1776dde23a714d705a3095c9808c68d17fe43':
  Fix QS not collapsing after some QQS gestures

Change-Id: I6d9f217dc122511bc898a36a8c019cd6c7bc265e

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

@@ -220,6 +220,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
         }
         MetricsLogger.visibility(mContext, MetricsEvent.QS_PANEL, mExpanded);
         if (!mExpanded) {
+            mTriggeredExpand = false;
             closeDetail();
         } else {
             logTiles();