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

am: a93b5bcb94 Change-Id: I77654a1d1629d738a98d65849776d7bb467a6a3c
2018-05-17 09:09:04 -07:00
parent 142ed09eaa a93b5bcb94
commit 69820609b7
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -252,7 +252,8 @@ public abstract class PanelView extends FrameLayout {

    @Override
    public boolean onTouchEvent(MotionEvent event) {
-        if (mInstantExpanding || mTouchDisabled
+        if (mInstantExpanding
+                || (mTouchDisabled && event.getActionMasked() != MotionEvent.ACTION_CANCEL)
                || (mMotionAborted && event.getActionMasked() != MotionEvent.ACTION_DOWN)) {
            return false;
        }