diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-02-24 14:16:59 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-02-24 14:16:59 -0800 |
| commit | 29fdb24c86b4bdf9b51a2e58def0e192bc169e91 (patch) | |
| tree | dc9ade36dc6304a91d661273e4470a2fcedbf54e /packages/SystemUI/src/com/android/systemui/statusbar/phone | |
| parent | b26f3f675f4630542436e15aaece23385fbd3a42 (diff) | |
| parent | c5e8dca7f11d3c085dd1e98692fcc21f1bcc0f6f (diff) | |
| download | frameworks_base-29fdb24c86b4bdf9b51a2e58def0e192bc169e91.zip frameworks_base-29fdb24c86b4bdf9b51a2e58def0e192bc169e91.tar.gz frameworks_base-29fdb24c86b4bdf9b51a2e58def0e192bc169e91.tar.bz2 | |
Merge "Bugfix : Quick pulldown sometimes flips when it should not" into cm-10.1
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/phone')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 7 |
1 files changed, 6 insertions, 1 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 b46aa3d..480dc99 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -181,7 +181,12 @@ public class NotificationPanelView extends PanelView { if (getMeasuredHeight() < mHandleBarHeight) { mStatusBar.switchToSettings(); } else { - mStatusBar.flipToSettings(); + // Do not flip if the drag event started within the top bar + if (MotionEvent.ACTION_DOWN == event.getActionMasked() && event.getY(0) < mHandleBarHeight ) { + mStatusBar.switchToSettings(); + } else { + mStatusBar.flipToSettings(); + } } mOkToFlip = false; } |