Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 51309c7a: Merge "Fix not being able to dismiss notifications with tap." into lmp-preview-dev

Browse Source 
* commit '51309c7ad93b2cbbe8fec828a49542d1207c4aa5':
  Fix not being able to dismiss notifications with tap.
This commit is contained in:
Jorim Jaggi
2014-06-04 20:53:01 +00:00
committed by Android Git Automerger
parent f3397e04a5 d63d298047
commit 095e3d300e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/ExpandHelper.java
View File

@@ -437,7 +437,7 @@ public class ExpandHelper implements Gefingerpoken {
break;
}
mLastMotionY = ev.getRawY();
return true;
return mResizedView != null;
}
/**

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
View File

@@ -162,7 +162,7 @@ public abstract class PanelView extends FrameLayout {
if (mHeightAnimator != null) {
mHeightAnimator.cancel(); // end any outstanding animations
}
mTouchSlopExceeded = true;
mTouchSlopExceeded = (mHeightAnimator != null && !mHintAnimationRunning);
onTrackingStarted();
}
if (mExpandedHeight == 0) {
@@ -219,7 +219,8 @@ public abstract class PanelView extends FrameLayout {
case MotionEvent.ACTION_CANCEL:
mTrackingPointer = -1;
trackMovement(event);
if (mTracking && mTouchSlopExceeded) {
if ((mTracking && mTouchSlopExceeded)
|| event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
float vel = getCurrentVelocity();
boolean expand = flingExpands(vel);
onTrackingStopped(expand);