commit 41e224c387e65d761746b804d2ae6f8771d526a3
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Nov 16 02:12:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 16 02:12:15 2019 +0000
tree c31b2d8df0059df26acc6f366b57e6575edb2e7a
parent 94f8c28ef51102a9c37037fb19020c6c9c3742ab
parent 978588f69b044d5b9a60235ee456daefc7dbdcbf

Merge "Fix swiping down on the notch."

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java
index c1328ec..6d6a1fe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java
@@ -188,6 +188,7 @@
                 boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP;
                 boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL;
 
+                boolean expandingBelowNotch = mExpandingBelowNotch;
                 if (isUp || isCancel) {
                     mExpandingBelowNotch = false;
                 }
@@ -236,8 +237,9 @@
                 // regular view bounds.
                 if (isDown && ev.getY() >= mView.getBottom()) {
                     mExpandingBelowNotch = true;
+                    expandingBelowNotch = true;
                 }
-                if (mExpandingBelowNotch) {
+                if (expandingBelowNotch) {
                     return mStatusBarView.dispatchTouchEvent(ev);
                 }