diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2021-04-09 10:08:19 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-04-12 07:20:14 +0200 |
| commit | d3f8f4b1663214ebe29e49e109b1ae704b680b9e (patch) | |
| tree | 77360304740f857841dfe4539693aa6087aabef1 /android/.gitignore | |
| parent | bcb74b50920a44729ba2c88db98738a61d8d9920 (diff) | |
android: Turn 3 "internal" docs into raw resources
Make 'example.odt', 'license.txt' and 'notice.txt'
(which can be opened via the "About" dialog)
resources of the app by copying them to a new directory
'res_generated' instead of into assets, and include
'res_generated' into resources, then use an
'android.resource://' URI instead of a 'file:///assets/'
one in AboutDialogFragment.
The latter does not work with when passed as a parameter
to 'ContentResolver.openInputStream'.
Adapt/Simplify 'LibreOfficeMainActivity#copyFileToTemp' to
make loading those docs using the 'android.resource://'
URI work and use the existing 'copyStream' method for copying from
the input to the output stream.
This is in preparation for upcoming commit with Change-Id
I7731ef81a4242fa0ce3b3fd8ced1683a6a6bee8c,
"android: Always create a temporary local copy of the doc".
Change-Id: I7731ef81a4242fa0ce3b3fd8ced1683a6a6bee8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113881
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'android/.gitignore')
| -rw-r--r-- | android/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/.gitignore b/android/.gitignore index 163145dd63fa..de608fea3c14 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -6,6 +6,7 @@ /source/build/ /source/captures/ /source/jni/Application.mk +/source/res_generated /jniLibs/ /source/liboSettings.gradle /source/local.properties |