Merge "Abort swipe up gesture when long press is detected" into mnc-dev

packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java

@@ -105,6 +105,13 @@ public class DelegateViewHelper {
         return mPanelShowing;
     }
 
+    public void abortCurrentGesture() {
+        if (mStarted) {
+            mStarted = false;
+            mBar.setInteracting(StatusBarManager.WINDOW_NAVIGATION_BAR, false);
+        }
+    }
+
     public void setSourceView(View view) {
         mSourceView = view;
         if (mSourceView != null) {

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

@@ -245,6 +245,11 @@ public class NavigationBarView extends LinearLayout {
         return intercept;
     }
 
+    public void abortCurrentGesture() {
+        mDelegateHelper.abortCurrentGesture();
+        getHomeButton().abortCurrentGesture();
+    }
+
     private H mHandler = new H();
 
     public View getCurrentView() {

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

@@ -1013,7 +1013,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             invokeAssistGesture(true /* vibrate */);
             awakenDreams();
             if (mNavigationBarView != null) {
-                mNavigationBarView.getHomeButton().abortCurrentGesture();
+                mNavigationBarView.abortCurrentGesture();
             }
         }
     };