diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-09-28 19:56:45 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-01-18 19:35:43 +0100 |
commit | 494297afe3a14d9aeef6b54515b7dceff5e1cc5f (patch) | |
tree | eff6917250e366368d941938a9d60ed09d51fa09 /android/source/res | |
parent | enable c++17 for android again after boost auto_ptr has a workaround (diff) | |
download | core-494297afe3a14d9aeef6b54515b7dceff5e1cc5f.tar.gz core-494297afe3a14d9aeef6b54515b7dceff5e1cc5f.zip |
pass context as parameter instead of risk of leaking memory
Also adjust to dynamic permissions after bumping target-SDK.
There still is some confusion about the concept of "external storage" in
the code. LocalDocuments already is "external storage" - clean that up a
little and use AppCompat function instead of using a legacy class for
ExternalDocuments provider.
Doesn't help for broken ROMs though, that would need guessing pathname
for a mounted SD (in addition to separate storage partition of builtin
storage).
Also c6e8c96d50fc2082a3c4b9553196a42bbdd6df37 incorrectly changed the
conditional around, making the whole ExternalDocumentsProvider useless/a
copy of the Local one (i.e. the primary, first returned by the system).
Real fix for tdf#99539 likely was 66be4feef7e0d3661f01fbb2372700de5eeea070
Change-Id: I88ca7742c0f2e89d63c338c8852ad88be0a46e4b
Reviewed-on: https://gerrit.libreoffice.org/45572
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'android/source/res')
-rw-r--r-- | android/source/res/menu/navigation_menu.xml | 2 | ||||
-rw-r--r-- | android/source/res/values/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/source/res/menu/navigation_menu.xml b/android/source/res/menu/navigation_menu.xml index 532c9ed60639..db680a9a1b8c 100644 --- a/android/source/res/menu/navigation_menu.xml +++ b/android/source/res/menu/navigation_menu.xml @@ -6,7 +6,7 @@ <item android:id="@+id/menu_provider_documents" android:title="@string/local_documents" - android:icon="@drawable/ic_insert_drive_file_black_24dp" /> + android:icon="@drawable/ic_folder_black_24dp" /> <item android:id="@+id/menu_provider_filesystem" android:title="@string/local_file_system" diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml index db06d3e2a7cc..5d7eca869a39 100644 --- a/android/source/res/values/strings.xml +++ b/android/source/res/values/strings.xml @@ -69,7 +69,7 @@ <!-- Document provider names --> <string name="document_locations">Document locations</string> <string name="close_document_locations">Close document locations</string> - <string name="local_documents">Local documents</string> + <string name="local_documents">Documents directory</string> <string name="local_file_system">Local file system</string> <string name="external_sd_file_system">External SD</string> <string name="otg_file_system">OTG device (experimental)</string> |