aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clearing the touch state on ACTON_UP/ACTIUON_CANCEL

Browse Source 
The touch listener may not get ACTION_DOWN if it came through an intercept,
in which case it will continue to use the previous state. Clearing the state
ensures that the next touch is not affected.

Bug: 76152745
Change-Id: I18cfbac67aa373e935822003e746af9def6d9122
This commit is contained in:
Sunny Goyal
2018-03-22 10:45:46 -07:00
parent 25a5472947
commit edc6fb4061
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/launcher3/touch/WorkspaceTouchListener.java
View File

@@ -102,23 +102,30 @@ public class WorkspaceTouchListener implements OnTouchListener, Runnable {
// Inform the workspace to cancel touch handling
ev.setAction(ACTION_CANCEL);
mWorkspace.onTouchEvent(ev);
ev.setAction(action);
mLongPressState = STATE_COMPLETED;
}
final boolean result;
if (mLongPressState == STATE_COMPLETED) {
// We have handled the touch, so workspace does not need to know anything anymore.
return true;
result = true;
} else if (mLongPressState == STATE_REQUESTED) {
mWorkspace.onTouchEvent(ev);
if (action == ACTION_UP || action == ACTION_CANCEL || mWorkspace.isHandlingTouch()) {
if (mWorkspace.isHandlingTouch()) {
cancelLongPress();
}
return true;
result = true;
} else {
// We don't want to handle touch, let workspace handle it as usual.
return false;
result = false;
}
if (action == ACTION_UP || action == ACTION_CANCEL) {
cancelLongPress();
}
return result;
}
private void cancelLongPress() {