commit bc5f496e470e64917367abf6730e68ace6def88e
author Jorim Jaggi <jjaggi@google.com> Mon May 12 00:00:52 2014 +0200
committer Jorim Jaggi <jjaggi@google.com> Mon May 12 15:25:24 2014 +0200
tree 48286a483d4ad23948203dfc209942ef8731abf7
parent 890e1892feac29b5bfe9b5f172a006e161e588d2

Fix QuickSettings header state on Keyguard.

It was in a weird state before when expanded. Now it is much better.

Change-Id: I17555b77c70720b6ead512e4ef61a62cc3a73318

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 2d96373..8387e36 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -414,11 +414,8 @@
         if (!mQsExpansionEnabled) {
             return false;
         }
-        View headerView = mStatusBar.getBarState() == StatusBarState.KEYGUARD && !mQsExpanded
-                ? mKeyguardStatusView
-                : mHeader;
-        boolean onHeader = x >= headerView.getLeft() && x <= headerView.getRight()
-                && y >= headerView.getTop() && y <= headerView.getBottom();
+        boolean onHeader = x >= mHeader.getLeft() && x <= mHeader.getRight()
+                && y >= mHeader.getTop() && y <= mHeader.getBottom();
         if (mQsExpanded) {
             return onHeader || (mScrollView.isScrolledToBottom() && yDiff < 0);
         } else {