diff options
| author | 2014-09-10 18:20:58 +0200 | |
|---|---|---|
| committer | 2014-09-10 18:22:24 +0200 | |
| commit | 0c85e8676eaf95be41fbfb2ab0cd28ce7f2b05fa (patch) | |
| tree | b4de3e065fd82efd601de6b16ee86c6af57f2e08 | |
| parent | c90f95c79ddd930c3fba13352f15ce7666eca402 (diff) | |
Fix QS interception on tablets
Only intercept when touching on the panel and not on the left or
right of the panel. Fixes a bug where the user couldn't dismiss the
panel by tapping outside.
Bug: 17437547
Change-Id: Ice484a301683fa2df1f2a21f13977023b48189f4
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 7 |
1 files changed, 4 insertions, 3 deletions
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 9585e1779e4d..902123dc0e5f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -631,9 +631,10 @@ public class NotificationPanelView extends PanelView implements } private boolean isInQsArea(float x, float y) { - return mStatusBarState != StatusBarState.SHADE - || y <= mNotificationStackScroller.getBottomMostNotificationBottom() - || y <= mQsContainer.getY() + mQsContainer.getHeight(); + return mStatusBarState != StatusBarState.SHADE || + (x >= mScrollView.getLeft() && x <= mScrollView.getRight()) && + (y <= mNotificationStackScroller.getBottomMostNotificationBottom() + || y <= mQsContainer.getY() + mQsContainer.getHeight()); } private void handleQsDown(MotionEvent event) { |