Merge "Fixed a bug where the QS could get stuck" into lmp-dev

2014-09-26 17:14:15 +00:00
parent c8ffeeca67 1fdd65e204
commit 17580af3cb
1 changed files with 1 additions and 2 deletions
--- 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 @@ public class NotificationPanelView extends PanelView implements
        if (mStatusBar.getBarState() == StatusBarState.KEYGUARD
                || mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED) {
            mAfforanceHelper.animateHideLeftRightIcon();
-        }
-        if (mQsExpanded) {
+        } else if (mQsExpanded) {
            mTwoFingerQsExpand = true;
        }
    }