From 4f8171998378f3e0f345b2b417afbfc9ad9738f0 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 14 Apr 2015 12:02:47 +0200 Subject: Pass on the auto repeat information for key events Task-number: QTBUG-45340 Change-Id: Iecc55987fa784e4bf14317d9d4a085a8f0b58451 Reviewed-by: Christian Stromme --- .../jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 9 ++++----- src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/android') diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index c7355c1530..73140839cc 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -983,7 +983,7 @@ public class QtActivityDelegate if (!m_backKeyPressedSent) return true; } - QtNative.keyDown(keyCode, c, event.getMetaState()); + QtNative.keyDown(keyCode, c, event.getMetaState(), event.getRepeatCount() > 0); return true; } @@ -1007,7 +1007,7 @@ public class QtActivityDelegate } m_metaState = MetaKeyKeyListener.handleKeyUp(m_metaState, keyCode, event); - QtNative.keyUp(keyCode, event.getUnicodeChar(), event.getMetaState()); + QtNative.keyUp(keyCode, event.getUnicodeChar(), event.getMetaState(), event.getRepeatCount() > 0); return true; } @@ -1018,8 +1018,8 @@ public class QtActivityDelegate && event.getCharacters() != null && event.getCharacters().length() == 1 && event.getKeyCode() == 0) { - QtNative.keyDown(0, event.getCharacters().charAt(0), event.getMetaState()); - QtNative.keyUp(0, event.getCharacters().charAt(0), event.getMetaState()); + QtNative.keyDown(0, event.getCharacters().charAt(0), event.getMetaState(), event.getRepeatCount() > 0); + QtNative.keyUp(0, event.getCharacters().charAt(0), event.getMetaState(), event.getRepeatCount() > 0); } try { @@ -1195,7 +1195,6 @@ public class QtActivityDelegate } else { m_activity.getWindow().setBackgroundDrawable(m_activity.getResources().getDrawable(attr.resourceId)); } - if (m_dummyView != null) { m_layout.removeView(m_dummyView); m_dummyView = null; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index bed9d69782..b2480618f8 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -593,8 +593,8 @@ public class QtNative // pointer methods // keyboard methods - public static native void keyDown(int key, int unicode, int modifier); - public static native void keyUp(int key, int unicode, int modifier); + public static native void keyDown(int key, int unicode, int modifier, boolean autoRepeat); + public static native void keyUp(int key, int unicode, int modifier, boolean autoRepeat); public static native void keyboardVisibilityChanged(boolean visibility); // keyboard methods -- cgit v1.2.3