commit d180d76305ef77ae170c6242b848694cb9e18fb9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 16 07:48:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 16 07:48:43 2017 +0000
tree e1dfb6139303a276196b6b0f6674d5e5e91d735b
parent 024494041f24d04f53fb201c24bb3dbd2d2fc4c6
parent 637323131ab73e7dca0c55b718be6644db41eb55

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

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 65bfb49..0df3321 100644
--- 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 @@
         recomputeDisableFlags(true /* animate */);
     }
 
+    public void cancelCurrentTouch() {
+        if (mNotificationPanel.isTracking()) {
+            mStatusBarWindow.cancelCurrentTouch();
+            if (mState == StatusBarState.SHADE) {
+                animateCollapsePanels();
+            }
+        }
+    }
 
     WakefulnessLifecycle.Observer mWakefulnessObserver = new WakefulnessLifecycle.Observer() {
         @Override