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

2018-05-17 15:58:08 +00:00
parent 5be1956952 44f9e5a597
commit a93b5bcb94
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;
        }