commit fc22dd58c98ae05705b2800a7eb97174a1bc281c
author Selim Cinek <cinek@google.com> Thu Nov 06 16:15:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 06 16:15:54 2014 +0000
tree 57823b3181eb548f64bf14bfaf00304a24bea98f
parent 8f6719a15d818269fecf3760297004740aa8a0dd
parent 49af6359e04095fa71162c7658f10cf93c94d341

am 49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev

* commit '49af6359e04095fa71162c7658f10cf93c94d341':
  Adapted HUN behavior when swiping vertically

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java
index e40bc5a..11ff272 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java
@@ -397,14 +397,11 @@
                     final float daX = Math.abs(ev.getX() - mFirstX);
                     final float daY = Math.abs(dY);
                     if (!mConsuming && daX < daY && daY > mTouchSlop) {
+                        releaseAndClose();
                         if (dY > 0) {
                             if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found an open");
                             mBar.animateExpandNotificationsPanel();
                         }
-                        if (dY < 0) {
-                            if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found a close");
-                            mBar.onHeadsUpDismissed();
-                        }
                         mConsuming = true;
                     }
                     break;