commit 8d2be4baf18b983a2a77998d41aa43b9244fca96
author Selim Cinek <cinek@google.com> Fri Sep 26 20:52:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 20:52:37 2014 +0000
tree 887877ecab2a7a354c896c888ba1c2da2fd662e0
parent ec017cbbcbf871d96eed58ed30aa263d57e23050
parent 99295a3f01f148e359ce24c0bd4bc659d494d7a8

am d21c44ae: am 1a13fcb0: am 144341e8: am 9583b5a9: Merge "Fixed a bug where the QS could get stuck" into lmp-dev

* commit 'd21c44aeccbdc8891c67f0eecc40f55c6f2503b7':
  Fixed a bug where the QS could get stuck

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 2efa84a..b9efb22 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1458,8 +1458,7 @@
         if (mStatusBar.getBarState() == StatusBarState.KEYGUARD
                 || mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED) {
             mAfforanceHelper.animateHideLeftRightIcon();
-        }
-        if (mQsExpanded) {
+        } else if (mQsExpanded) {
             mTwoFingerQsExpand = true;
         }
     }