diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-04-12 17:50:52 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-04-13 08:13:06 +0200 |
| commit | 34d012a128dfa959aa345672ebf4f9de80253b63 (patch) | |
| tree | fba30b0efc768e01948b53bf44c97ae6ae411c78 /sal | |
| parent | ad4c8fed1b1b95fb502a011bb5fce5b8cb9d840d (diff) | |
android: Make the tiled rendering from the loolwsd actually work.
Not to break the 'old' Android app, introduce a bool that can indicate
if we are using the LOK from the 'old' (LOK-via-JNI-based) or from the
'new' (loolwsd-based) app.
Change-Id: I38bd665cc1d5bc88018574171443ecabc46763df
Reviewed-on: https://gerrit.libreoffice.org/70678
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/android/libreofficekit-jni.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c index edd56a2fec37..0f66fdc44fe0 100644 --- a/sal/android/libreofficekit-jni.c +++ b/sal/android/libreofficekit-jni.c @@ -37,6 +37,7 @@ extern const char* data_dir; extern const char* cache_dir; extern void* apk_file; extern int apk_file_size; +extern bool android_lok_from_jni; ///< for the distinction if the LOK is used for the 'old' (JNI-based) or the 'new' (loolwsd-based) app AAssetManager* native_asset_manager; extern void Java_org_libreoffice_android_Bootstrap_putenv(JNIEnv* env, jobject clazz, jstring string); @@ -157,6 +158,11 @@ jboolean Java_org_libreoffice_kit_LibreOfficeKit_initializeNative size_t data_dir_len; (void) clazz; + + // the 'old' app needs to avoid setting the virtual device to transparent + // in paintTile(), so indicate we are using the 'old' app + android_lok_from_jni = true; + libreofficekit_initialize(env, dataDir, cacheDir, apkFile, assetManager); // LibreOfficeKit expects a path to the program/ directory |