Merge "QuickSettings was inaccessible sometimes with empty shade."

1 files changed, 1 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index ec35d41ea557..20fb225c8382 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -529,7 +529,6 @@ public class PanelView extends FrameLayout {
 
         switch (event.getActionMasked()) {
             case MotionEvent.ACTION_DOWN:
-                mTracking = true;
                 if (mHandleView != null) {
                     mHandleView.setPressed(true);
                     // catch the press state change
@@ -561,6 +560,7 @@ public class PanelView extends FrameLayout {
                     if (h < -mTouchSlop) {
                         mInitialOffsetOnTouch = mExpandedHeight;
                         mInitialTouchY = y;
+                        mTracking = true;
                         return true;
                     }
                 }