AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Allow more than three touch points

Browse Source 
Now that we do not support Android versions below API level 9, we
can use the modern multi-touch functions.

Change-Id: I5887b4c35f9e02089a334526cebecf0cf767bd6c
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Paul Olav Tvete 2013-03-06 18:01:37 +01:00 committed by The Qt Project
parent 638d9d3831
commit 5e907919d7
1 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/android/jar/src/org/qtproject/qt5/android/QtNative.java
View File

@ -279,10 +279,10 @@ public class QtNative
});
}
//@ANDROID-5
//@ANDROID-9
static private int getAction(int index, MotionEvent event)
{
int action = event.getAction();
int action = event.getActionMasked();
if (action == MotionEvent.ACTION_MOVE) {
int hsz = event.getHistorySize();
if (hsz > 0) {
@ -295,48 +295,14 @@ public class QtNative
}
return 1;
}
switch (index) {
case 0:
if (action == MotionEvent.ACTION_DOWN
|| action == MotionEvent.ACTION_POINTER_1_DOWN) {
return 0;
}
if (action == MotionEvent.ACTION_UP
|| action == MotionEvent.ACTION_POINTER_1_UP) {
return 3;
}
break;
case 1:
if (action == MotionEvent.ACTION_POINTER_2_DOWN
|| action == MotionEvent.ACTION_POINTER_DOWN) {
return 0;
}
if (action == MotionEvent.ACTION_POINTER_2_UP
|| action == MotionEvent.ACTION_POINTER_UP) {
return 3;
}
break;
case 2:
if (action == MotionEvent.ACTION_POINTER_3_DOWN
|| action == MotionEvent.ACTION_POINTER_DOWN) {
return 0;
}
if (action == MotionEvent.ACTION_POINTER_3_UP
|| action == MotionEvent.ACTION_POINTER_UP) {
return 3;
}
break;
if (action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN && index == event.getActionIndex()) {
return 0;
} else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP && index == event.getActionIndex()) {
return 3;
}
return 2;
}
//@ANDROID-5
//@ANDROID-9
static public void sendTouchEvent(MotionEvent event, int id)
{