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

am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)

Browse Source 
* commit 'd7a863be76afb458cb59472ad02d49568ada6e04':
  Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
This commit is contained in:
Winson Chung
2014-09-10 00:17:15 +00:00
committed by Android Git Automerger
parent 93638be299 e5c06a6431
commit 48073f9aa7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarViewTaskSwitchHelper.java
View File

@@ -31,7 +31,6 @@ public class NavigationBarViewTaskSwitchHelper extends GestureDetector.SimpleOnG
private final GestureDetector mTaskSwitcherDetector;
private final int mScrollTouchSlop;
private final int mMinFlingVelocity;
private boolean mInterceptTouches;
private int mTouchDownX;
private int mTouchDownY;
@@ -56,11 +55,11 @@ public class NavigationBarViewTaskSwitchHelper extends GestureDetector.SimpleOnG
// task switcher detector
mTaskSwitcherDetector.onTouchEvent(event);
int action = event.getAction();
boolean interceptTouches = false;
switch (action & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN: {
mTouchDownX = (int) event.getX();
mTouchDownY = (int) event.getY();
mInterceptTouches = false;
break;
}
case MotionEvent.ACTION_MOVE: {
@@ -72,21 +71,19 @@ public class NavigationBarViewTaskSwitchHelper extends GestureDetector.SimpleOnG
? xDiff > mScrollTouchSlop && xDiff > yDiff
: yDiff > mScrollTouchSlop && yDiff > xDiff;
if (exceededTouchSlop) {
mInterceptTouches = true;
interceptTouches = true;
return true;
}
break;
}
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
mInterceptTouches = false;
break;
}
return mInterceptTouches;
return interceptTouches;
}
public boolean onTouchEvent(MotionEvent event) {
if (!mInterceptTouches) return false;
return mTaskSwitcherDetector.onTouchEvent(event);
}