am 42bbbeb2: am be31021b: Merge "Disable touch dispatch while adjusting brightness" into lmp-dev

* commit '42bbbeb2d9e85bc67235e6006cc1f1c7a27ac9b8':
  Disable touch dispatch while adjusting brightness
This commit is contained in:
Adrian Roos
2014-09-03 05:48:30 +00:00
committed by Android Git Automerger

View File

@@ -42,6 +42,7 @@ public class StatusBarWindowView extends FrameLayout {
private DragDownHelper mDragDownHelper;
private NotificationStackScrollLayout mStackScrollLayout;
private NotificationPanelView mNotificationPanel;
private View mBrightnessMirror;
PhoneStatusBar mService;
@@ -72,6 +73,7 @@ public class StatusBarWindowView extends FrameLayout {
R.id.notification_stack_scroller);
mNotificationPanel = (NotificationPanelView) findViewById(R.id.notification_panel);
mDragDownHelper = new DragDownHelper(getContext(), this, mStackScrollLayout, mService);
mBrightnessMirror = findViewById(R.id.brightness_mirror);
// We really need to be able to animate while window animations are going on
// so that activities may be started asynchronously from panel animations
@@ -105,6 +107,19 @@ public class StatusBarWindowView extends FrameLayout {
return super.dispatchKeyEvent(event);
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (mBrightnessMirror != null && mBrightnessMirror.getVisibility() == VISIBLE) {
// Disallow new pointers while the brightness mirror is visible. This is so that you
// can't touch anything other than the brightness slider while the mirror is showing
// and the rest of the panel is transparent.
if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) {
return false;
}
}
return super.dispatchTouchEvent(ev);
}
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
boolean intercept = false;