Merge "Fix Panel position may not update when device screen off / on quickly." into pi-dev

This commit is contained in:
TreeHugger Robot
2018-05-17 15:58:08 +00:00
committed by Android (Google) Code Review

View File

@@ -252,7 +252,8 @@ public abstract class PanelView extends FrameLayout {
@Override @Override
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
if (mInstantExpanding || mTouchDisabled if (mInstantExpanding
|| (mTouchDisabled && event.getActionMasked() != MotionEvent.ACTION_CANCEL)
|| (mMotionAborted && event.getActionMasked() != MotionEvent.ACTION_DOWN)) { || (mMotionAborted && event.getActionMasked() != MotionEvent.ACTION_DOWN)) {
return false; return false;
} }