Merge "Add method to cancel StatusBar touch" into oc-mr1-dev

2017-08-16 07:48:43 +00:00
parent 024494041f 637323131a
commit d180d76305
1 changed files with 8 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -5153,6 +5153,14 @@ public class StatusBar extends SystemUI implements DemoMode,
        recomputeDisableFlags(true /* animate */);
    }

+    public void cancelCurrentTouch() {
+        if (mNotificationPanel.isTracking()) {
+            mStatusBarWindow.cancelCurrentTouch();
+            if (mState == StatusBarState.SHADE) {
+                animateCollapsePanels();
+            }
+        }
+    }

    WakefulnessLifecycle.Observer mWakefulnessObserver = new WakefulnessLifecycle.Observer() {
        @Override