diff options
Diffstat (limited to 'src/corelib/kernel/qjnihelpers_p.h')
-rw-r--r-- | src/corelib/kernel/qjnihelpers_p.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/corelib/kernel/qjnihelpers_p.h b/src/corelib/kernel/qjnihelpers_p.h index bce2b782de..a7b879d9e1 100644 --- a/src/corelib/kernel/qjnihelpers_p.h +++ b/src/corelib/kernel/qjnihelpers_p.h @@ -22,8 +22,8 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_JNI_TYPE(Activity, "Landroid/app/Activity;") -Q_DECLARE_JNI_TYPE(Service, "Landroid/app/Service;") +Q_DECLARE_JNI_CLASS(Activity, "android/app/Activity") +Q_DECLARE_JNI_CLASS(Service, "android/app/Service") namespace QtAndroidPrivate { @@ -49,6 +49,13 @@ namespace QtAndroidPrivate virtual void handleResume(); }; + class Q_CORE_EXPORT OnBindListener + { + public: + virtual ~OnBindListener() {} + virtual jobject onBind(jobject intent) = 0; + }; + class Q_CORE_EXPORT GenericMotionEventListener { public: @@ -63,13 +70,6 @@ namespace QtAndroidPrivate virtual bool handleKeyEvent(jobject event) = 0; }; - class Q_CORE_EXPORT OnBindListener - { - public: - virtual ~OnBindListener() {} - virtual jobject onBind(jobject intent) = 0; - }; - Q_CORE_EXPORT QtJniTypes::Activity activity(); Q_CORE_EXPORT QtJniTypes::Service service(); Q_CORE_EXPORT QtJniTypes::Context context(); @@ -79,8 +79,9 @@ namespace QtAndroidPrivate jobject classLoader(); Q_CORE_EXPORT jint androidSdkVersion(); - bool registerPermissionNatives(); - bool registerNativeInterfaceNatives(); + bool registerPermissionNatives(QJniEnvironment &env); + bool registerNativeInterfaceNatives(QJniEnvironment &env); + bool registerExtrasNatives(QJniEnvironment &env); Q_CORE_EXPORT void handleActivityResult(jint requestCode, jint resultCode, jobject data); Q_CORE_EXPORT void registerActivityResultListener(ActivityResultListener *listener); @@ -90,17 +91,17 @@ namespace QtAndroidPrivate Q_CORE_EXPORT void registerNewIntentListener(NewIntentListener *listener); Q_CORE_EXPORT void unregisterNewIntentListener(NewIntentListener *listener); - Q_CORE_EXPORT void handlePause(); - Q_CORE_EXPORT void handleResume(); - Q_CORE_EXPORT void registerResumePauseListener(ResumePauseListener *listener); - Q_CORE_EXPORT void unregisterResumePauseListener(ResumePauseListener *listener); - Q_CORE_EXPORT void registerGenericMotionEventListener(GenericMotionEventListener *listener); Q_CORE_EXPORT void unregisterGenericMotionEventListener(GenericMotionEventListener *listener); Q_CORE_EXPORT void registerKeyEventListener(KeyEventListener *listener); Q_CORE_EXPORT void unregisterKeyEventListener(KeyEventListener *listener); + Q_CORE_EXPORT void handlePause(); + Q_CORE_EXPORT void handleResume(); + Q_CORE_EXPORT void registerResumePauseListener(ResumePauseListener *listener); + Q_CORE_EXPORT void unregisterResumePauseListener(ResumePauseListener *listener); + Q_CORE_EXPORT void waitForServiceSetup(); Q_CORE_EXPORT int acuqireServiceSetup(int flags); Q_CORE_EXPORT void setOnBindListener(OnBindListener *listener); |