Merge "Don't clear the interacting bit if panel handled touch." into klp-dev

2013-11-04 18:25:09 +00:00
parent 60999fcb2e d157ca049a
commit 8f42b4e8e4
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -113,7 +113,7 @@ public class StatusBarWindowView extends FrameLayout
            handled = super.onTouchEvent(ev);
        }
        final int action = ev.getAction();
-        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+        if (!handled && (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL)) {
            mService.setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
        }
        return handled;