am 7755e39f: am 8f42b4e8: Merge "Don\'t clear the interacting bit if panel handled touch." into klp-dev

* commit '7755e39f58b2629a21f4a0eb30da24c92979ead2':
  Don't clear the interacting bit if panel handled touch.
This commit is contained in:
John Spurlock
2013-11-04 21:54:33 -08:00
committed by Android Git Automerger

View File

@@ -113,7 +113,7 @@ public class StatusBarWindowView extends FrameLayout
handled = super.onTouchEvent(ev); handled = super.onTouchEvent(ev);
} }
final int action = ev.getAction(); 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); mService.setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
} }
return handled; return handled;