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

* commit '49af6359e04095fa71162c7658f10cf93c94d341':
  Adapted HUN behavior when swiping vertically
This commit is contained in:
Selim Cinek
2014-11-06 16:15:54 +00:00
committed by Android Git Automerger

View File

@@ -397,14 +397,11 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
final float daX = Math.abs(ev.getX() - mFirstX); final float daX = Math.abs(ev.getX() - mFirstX);
final float daY = Math.abs(dY); final float daY = Math.abs(dY);
if (!mConsuming && daX < daY && daY > mTouchSlop) { if (!mConsuming && daX < daY && daY > mTouchSlop) {
releaseAndClose();
if (dY > 0) { if (dY > 0) {
if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found an open"); if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found an open");
mBar.animateExpandNotificationsPanel(); mBar.animateExpandNotificationsPanel();
} }
if (dY < 0) {
if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found a close");
mBar.onHeadsUpDismissed();
}
mConsuming = true; mConsuming = true;
} }
break; break;