1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Differentiate between standalone Qt app and embedded view

Browse Source 
Add a helper method to tell whether the app is a standalone Qt for
Android app, where also the Context is created by Qt, or whether Qt
content is embedded as a View into a Context created by the user, i.e.
a "native" Android app.

Pick-to: 6.7
Change-Id: I618ba1c8cb40c9b132fc12a7ee6d54c071efa983
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Tinja Paavoseppä 2023-10-31 14:25:45 +02:00 committed by Soheil Armin
parent cca81a6636
commit c1a79b442c
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -50,6 +50,9 @@ static AAssetManager *m_assetManager = nullptr;
static jobject m_assets = nullptr; static jobject m_assets = nullptr;
static jobject m_resourcesObj = nullptr; static jobject m_resourcesObj = nullptr;
static jclass m_qtActivityClass = nullptr;
static jclass m_qtServiceClass = nullptr;
static QtJniTypes::QtActivityDelegate m_activityDelegate = nullptr; static QtJniTypes::QtActivityDelegate m_activityDelegate = nullptr;
static QtJniTypes::QtInputDelegate m_inputDelegate = nullptr; static QtJniTypes::QtInputDelegate m_inputDelegate = nullptr;
@ -203,6 +206,20 @@ namespace QtAndroid
return m_inputDelegate; return m_inputDelegate;
} }
bool isQtApplication()
{
// Returns true if the app is a Qt app, i.e. Qt controls the whole app and
// the Activity/Service is created by Qt. Returns false if instead Qt is
// embedded into a native Android app, where the Activity/Service is created
// by the user, outside of Qt, and Qt content is added as a view.
JNIEnv *env = QJniEnvironment::getJniEnv();
static const jint isQtActivity = env->IsInstanceOf(QtAndroidPrivate::activity().object(),
m_qtActivityClass);
static const jint isQtService = env->IsInstanceOf(QtAndroidPrivate::service().object(),
m_qtServiceClass);
return isQtActivity || isQtService;
}
void notifyAccessibilityLocationChange(uint accessibilityObjectId) void notifyAccessibilityLocationChange(uint accessibilityObjectId)
{ {
qtActivityDelegate().callMethod<void>("notifyLocationChange", accessibilityObjectId); qtActivityDelegate().callMethod<void>("notifyLocationChange", accessibilityObjectId);
@ -500,6 +517,10 @@ static void terminateQt(JNIEnv *env, jclass /*clazz*/)
env->DeleteGlobalRef(m_bitmapDrawableClass); env->DeleteGlobalRef(m_bitmapDrawableClass);
if (m_assets) if (m_assets)
env->DeleteGlobalRef(m_assets); env->DeleteGlobalRef(m_assets);
if (m_qtActivityClass)
env->DeleteGlobalRef(m_qtActivityClass);
if (m_qtServiceClass)
env->DeleteGlobalRef(m_qtServiceClass);
m_androidPlatformIntegration = nullptr; m_androidPlatformIntegration = nullptr;
delete m_androidAssetsFileEngineHandler; delete m_androidAssetsFileEngineHandler;
m_androidAssetsFileEngineHandler = nullptr; m_androidAssetsFileEngineHandler = nullptr;
@ -817,6 +838,11 @@ static bool registerNatives(QJniEnvironment &env)
m_bitmapDrawableClass, m_bitmapDrawableClass,
"<init>", "(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V"); "<init>", "(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V");
FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtActivityBase");
m_qtActivityClass = static_cast<jclass>(env->NewGlobalRef(clazz));
FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtServiceBase");
m_qtServiceClass = static_cast<jclass>(env->NewGlobalRef(clazz));
return true; return true;
} }

2
src/plugins/platforms/android/androidjnimain.h
View File

@ -76,6 +76,8 @@ namespace QtAndroid
QString deviceName(); QString deviceName();
bool blockEventLoopsWhenSuspended(); bool blockEventLoopsWhenSuspended();
bool isQtApplication();
} }
QT_END_NAMESPACE QT_END_NAMESPACE