diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-02-04 17:04:10 +0100 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2019-02-04 17:11:24 +0100 |
| commit | cbc5109d0da02f4c75ec21c22646fbbbfa8fece4 (patch) | |
| tree | 2d153fed1dcd1579261c1425d04180e8d81e4871 | |
| parent | e653623bfae6cbee7dc8b8029ef626113810ecb2 (diff) | |
| download | android_packages_apps_Trebuchet-cbc5109d0da02f4c75ec21c22646fbbbfa8fece4.tar.gz android_packages_apps_Trebuchet-cbc5109d0da02f4c75ec21c22646fbbbfa8fece4.tar.bz2 android_packages_apps_Trebuchet-cbc5109d0da02f4c75ec21c22646fbbbfa8fece4.zip | |
Set isInitialDown before working on the Array
* Also move isFinalUp one call up
Matches Google
Change-Id: I8aa953227e119f9bb7707e72ce92f140b1b9d82b
| -rw-r--r-- | src/com/android/launcher3/touch/TouchEventTranslator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/touch/TouchEventTranslator.java b/src/com/android/launcher3/touch/TouchEventTranslator.java index 4228a120a..d10001b4c 100644 --- a/src/com/android/launcher3/touch/TouchEventTranslator.java +++ b/src/com/android/launcher3/touch/TouchEventTranslator.java @@ -115,6 +115,7 @@ public class TouchEventTranslator { private TouchEventTranslator put(int id, int index, float x, float y, long ms, MotionEvent ev) { int action; + boolean isInitialDown = mFingers.size() == 0; checkFingerExistence(id, false); mFingers.put(id, new PointF(x, y)); int n = mFingers.size(); @@ -128,7 +129,6 @@ public class TouchEventTranslator { mCache.put(n, new Pair<>(properties, coords)); } - boolean isInitialDown = mFingers.size() == 0; action = isInitialDown ? MotionEvent.ACTION_DOWN : MotionEvent.ACTION_POINTER_DOWN | (index << MotionEvent.ACTION_POINTER_INDEX_SHIFT); @@ -144,9 +144,9 @@ public class TouchEventTranslator { private TouchEventTranslator lift(int id, int index, MotionEvent ev) { int action; + boolean isFinalUp = mFingers.size() == 1; checkFingerExistence(id, true); - boolean isFinalUp = mFingers.size() == 1; action = isFinalUp ? MotionEvent.ACTION_UP : MotionEvent.ACTION_POINTER_UP | (index << MotionEvent.ACTION_POINTER_INDEX_SHIFT); |