core.git: android/source
android/source/res/values-ast/strings.xml|2 -- android/source/res/values-ca/strings.xml |4 +--- android/source/res/values-cs/strings.xml |2 -- android/source/res/values-cy/strings.xml |2 -- android/source/res/values-de/strings.xml |2 -- android/source/res/values-dsb/strings.xml|2 -- android/source/res/values-el/strings.xml |2 -- android/source/res/values-eo/strings.xml |2 ++ android/source/res/values-es/strings.xml |2 -- android/source/res/values-eu/strings.xml |2 -- android/source/res/values-fa/strings.xml |2 -- android/source/res/values-fr/strings.xml |2 -- android/source/res/values-gl/strings.xml |2 -- android/source/res/values-hsb/strings.xml|2 -- android/source/res/values-hu/strings.xml |2 -- android/source/res/values-hy/strings.xml |2 -- android/source/res/values-ia/strings.xml |2 -- android/source/res/values-in/strings.xml |2 -- android/source/res/values-is/strings.xml |2 -- android/source/res/values-it/strings.xml |2 -- android/source/res/values-ja/strings.xml | 25 + android/source/res/values-nl/strings.xml |2 -- android/source/res/values-pa/strings.xml |2 -- android/source/res/values-pl/strings.xml |2 -- android/source/res/values-pt-rBR/strings.xml |2 -- android/source/res/values-pt/strings.xml |2 -- android/source/res/values-sl/strings.xml |2 -- android/source/res/values-tr/strings.xml |2 -- android/source/res/values-uk/strings.xml |2 -- android/source/res/values-zh-rTW/strings.xml |2 -- 30 files changed, 28 insertions(+), 57 deletions(-) New commits: commit 903e71eb452a0d9be4007497ca06b22765600188 Author: Weblate AuthorDate: Thu May 16 17:03:42 2024 +0200 Commit: Michael Weghorn CommitDate: Fri May 17 10:48:22 2024 +0200 Update translation files for android-viewer Updated by "Cleanup translation files" hook in Weblate. Change-Id: Iea28e4d8bf859accdb1c16bb4c6836237a4d2b26 android-viewer translated using Weblate Japanese currently translated at 61.0% (72 of 118 strings) Change-Id: I741c23b1048d4857605d73aad34668c29234dd6f android-viewer translated using Weblate Catalan currently translated at 100.0% (118 of 118 strings) Change-Id: I9cbcf579a5c634adf0686e43aa4dca069c2dd577 Added translation for android-viewer using Weblate (Esperanto) Change-Id: Ibcf6e82a860c5e789d6ee89dace30d1457a60c22 android-viewer translated using Weblate Japanese currently translated at 39.8% (47 of 118 strings) Change-Id: I9efdbae451a5313cb5b8ef4a1abca4bbc696969b Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Taichi Haradaguchi <20001...@ymail.ne.jp> Co-authored-by: Weblate Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ca/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ja/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167748 Reviewed-by: Michael Weghorn Tested-by: Jenkins diff --git a/android/source/res/values-ast/strings.xml b/android/source/res/values-ast/strings.xml index 6196a0fc98a7..0275c564febb 100644 --- a/android/source/res/values-ast/strings.xml +++ b/android/source/res/values-ast/strings.xml @@ -103,7 +103,6 @@ Val Encaboxar Orde d\'UNO actual -Llingua p\'amosar Esbilla una foto Acabó la esportación a PDF Nun se pudo esportar a PDF @@ -117,5 +116,4 @@ Color de la lletra Cambiar el nome de la diapositiva Automáticu -Afitar la llingua predeterminada de la interfaz \ No newline at end of file diff --git a/android/source/res/values-ca/strings.xml b/android/source/res/values-ca/strings.xml index 531bae150b78..72708562ec7c 100644 --- a/android/source/res/values-ca/strings.xml +++ b/android/source/res/values-ca/strings.xml @@ -92,7 +92,7 @@ Amplada òptima D\'acord D\'acord -Introduïu la longitud addicional en centèsimes de mil·límetre. +Introduïu la longitud addicional en centèsimes de mil·límetre Afegeix un full de càlcul No s\'ha trobat cap càmera Mida mitjana @@ -109,8 +109,6 @@ S\'ha canviat el nom de la part. S\'ha suprimit la part. D\'acord -Llengua de la interfície -Estableix la llengua predeterminada de la interfície L\'exportació a PDF ha finalitzat No s\'ha pogut exportar a pdf Ordre UNO actual diff --git a/android/source/res/values-cs/strings.xml b/android/source/res/values-cs/strings.xml index ee3bf0bc0b66..246e9e85d3d4 100644 ---
core.git: android/source
android/source/res/values-ja/strings.xml | 50 ++- 1 file changed, 49 insertions(+), 1 deletion(-) New commits: commit da7ad97bd014252d9757c407487929a518eee4f5 Author: Weblate AuthorDate: Tue May 14 13:38:02 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Thu May 16 05:58:51 2024 +0200 android-viewer translated using Weblate Japanese currently translated at 39.8% (47 of 118 strings) Change-Id: I9efdbae451a5313cb5b8ef4a1abca4bbc69e434b Co-authored-by: Taichi Haradaguchi <20001...@ymail.ne.jp> Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ja/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167630 Tested-by: Adolfo Jayme Barrientos Reviewed-by: Adolfo Jayme Barrientos diff --git a/android/source/res/values-ja/strings.xml b/android/source/res/values-ja/strings.xml index a6b3daec9354..c342b192f4ca 100644 --- a/android/source/res/values-ja/strings.xml +++ b/android/source/res/values-ja/strings.xml @@ -1,2 +1,50 @@ - \ No newline at end of file + +キャンセル +新規ファイルを作成 +スライド +無題 +パスワード +https://ja.libreoffice.org +貼り付け +OK +保存 +名前を付けて保存… +閉じる前にドキュメントを保存しますか? +フォントの色 +自動 +切り取り +ページ +挿入 +印刷 +段落 +削除 +元に戻す +このリリースは$VENDORが提供しました。 +OK +全般 +PDFへのエクスポート +スライド名の変更 +プライバシーポリシー +スライドショー +コピー +挿入 +検索 +保存完了 +エラー +LibreOffice Viewerの設定 +保存 +UNOコマンド +OK +設定 +シート +バージョン: %1$sbrビルドID: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +ライセンスを表示 +すべてのファイル +LibreOffice Viewer +キャンセル +次を検索 +前を検索 +このファイルは読み取り専用です。 +キャンセル + \ No newline at end of file
core.git: android/source
android/source/AndroidManifest.xml|1 android/source/src/java/org/libreoffice/FormattingController.java | 38 +++--- 2 files changed, 13 insertions(+), 26 deletions(-) New commits: commit e1216e47751b80238825aaeb21702d46dc34 Author: Michael Weghorn AuthorDate: Mon May 13 15:36:20 2024 +0200 Commit: Michael Weghorn CommitDate: Tue May 14 08:37:49 2024 +0200 android: Fix taking photos by dropping permission At least on recent devices (seen e.g. on an AVD with API level 34 and a Fairphone 3 with LineageOS 20 (based on Android 13)), inserting a picture by taking a photo using the camera didn't work, "nothing was happening" when choosing the corresponding option from the formatting toolbar with experimental editing mode enabled. This is due to the system filtering information about other apps/packages with target API level >= 30 for privacy reasons, see [1] for more details. As described at [2], requesting the `CAMERA` permission is not required: > Users might take pictures in your app, using the pre-installed > system camera app. > > In this situation, don't declare the CAMERA permission. Instead, > invoke the ACTION_IMAGE_CAPTURE intent action. In fact, specifying the permission is even counter-productive and would cause this to not work, as also described at [2]: > Note: If your app declares Manifest.permission.CAMERA > permission and is not granted, then the action results in > a SecurityException. Rather than explicitly requesting the permission, just drop it from the AndroidManifest, as it's not needed. Also drop the additional code interacting with the package manager, as that doesn't work with newer API versions as described above. With these changes in place, inserting a photo works fine in tests in API 21 and API 34 AVDs and on the above-mentioned Fairphone 3. [1] https://developer.android.com/training/package-visibility [2] https://developer.android.com/privacy-and-security/minimize-permission-requests#take-photo Change-Id: Ia1ee4e4de577a269e2b79bf5460d08b1bf2bee56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167603 Reviewed-by: Michael Weghorn Tested-by: Jenkins diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index 3ece77d62bfd..ba71fdddb197 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -6,7 +6,6 @@ - resInfoList = mContext.getPackageManager() -.queryIntentActivities(takePictureIntent, PackageManager.MATCH_DEFAULT_ONLY); -for (ResolveInfo resolveInfo : resInfoList) { -String packageName = resolveInfo.activityInfo.packageName; -mContext.grantUriPermission(packageName, photoURI, Intent.FLAG_GRANT_WRITE_URI_PERMISSION -| Intent.FLAG_GRANT_READ_URI_PERMISSION); -} -mContext.startActivityForResult(takePictureIntent, TAKE_PHOTO); -} +// Create the File where the photo should go +File photoFile = null; +try { +photoFile = createImageFile(); +} catch (IOException ex) { +ex.printStackTrace(); +} +// Continue only if the File was successfully created +if (photoFile != null) { +Uri photoURI = FileProvider.getUriForFile(mContext, +mContext.getPackageName() + ".fileprovider", photoFile); +takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI); +mContext.startActivityForResult(takePictureIntent, TAKE_PHOTO); } }
core.git: android/source
android/source/res/values-ast/strings.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 06ab9f194b30fa76e661b99cc50b1068114c15c1 Author: Weblate AuthorDate: Sat May 4 07:37:38 2024 +0200 Commit: Michael Weghorn CommitDate: Mon May 6 15:44:22 2024 +0200 android-viewer translated using Weblate Asturian currently translated at 100.0% (118 of 118 strings) Change-Id: I5f400c4bcecb6021add6197190e235193fcca4bb Co-authored-by: Adolfo Jayme Barrientos Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ast/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167105 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-ast/strings.xml b/android/source/res/values-ast/strings.xml index 27e9d06bd131..6196a0fc98a7 100644 --- a/android/source/res/values-ast/strings.xml +++ b/android/source/res/values-ast/strings.xml @@ -116,6 +116,6 @@ Color de resalte Color de la lletra Cambiar el nome de la diapositiva -Automaticu +Automáticu Afitar la llingua predeterminada de la interfaz \ No newline at end of file
core.git: android/source
android/source/res/values-ia/strings.xml | 78 +++ 1 file changed, 78 insertions(+) New commits: commit 7de034b1e4467dd39bd08c7bab53b5a00c5269fd Author: Weblate AuthorDate: Wed Apr 17 04:37:32 2024 +0200 Commit: Michael Weghorn CommitDate: Mon Apr 22 08:15:38 2024 +0200 Update translation files for android-viewer Updated by "Remove blank strings" hook in Weblate. Change-Id: I860c8e56454c26123414f842517461507b8a0f3f android-viewer translated using Weblate Interlingua currently translated at 63.5% (75 of 118 strings) Change-Id: I9159b9b5b3c37adabb078af9b394214217564538 Added translation for android-viewer using Weblate (Interlingua) Change-Id: I1e6a22c54275747ac05825459574e522e1b0ea40 Co-authored-by: SoftInterlingua Co-authored-by: Weblate Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ia/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166116 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-ia/strings.xml b/android/source/res/values-ia/strings.xml new file mode 100644 index ..09a33ba1608f --- /dev/null +++ b/android/source/res/values-ia/strings.xml @@ -0,0 +1,78 @@ + + +Activar le modo disveloppator ubi tu pote inviar commandos UNO intra le application. Usa lo sub tu proprie risco. +LibreOffice Viewer es un visualisator de documentos basate sur LibreOffice. +Monstrar +Modo de disveloppator +Cancellar +Crear un nove file +Celar +Inviar commando UNO +sin titulo +A proposito de +Activar formato +Contrasigno +Typo +Retro +Bmp non valide! +Collar +OK +SALVEGUARDAR +Nove folio de calculo +Selige un file a aperir +Non poteva exportar a PDF +Salveguardar como… +Color de littera +Nove designo +Automatic +Refacer +icone de file +Files recente +Pagina +Inserer +Stylo +Seliger un imagine +NON +Nove documento de texto +Imprimer +Nove presentation +Modo experimental +Deler +Disfacer +Iste version es fornite per $VENDOR. +Insere le contrasigno +OK +Partes +Definir le lingua predefinite del interfacie +General +Texto copiate al area de transferentia +Exportar a PDF +Monstrar le claviero +Politica de confidentialitate +Presentation de diapositivas +Seliger un photo +Copiar +Inserer +Cerca +Necun camera trovate +Error +Parametros del visualisator de LibreOffice +Le nomine fornite jam es in uso. +Salveguardar +OK +Parametros +Version: %1$sbrID de compilation: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +Monstrar le licentia +Tote le files +Non poteva salveguardar le file +Visualisator de LibreOffice +Adder un diapositiva +Cancellar +Lingua a monstrar +Trovar le sequente +Trovar le previe +Activar le modo de modification experimental. Usa lo sub tu proprie risco. +Iste file es solo lectura +Monstrar le aviso +Cancellar + \ No newline at end of file
core.git: android/source
android/source/build.gradle |2 android/source/lint-baseline.xml | 79 +-- 2 files changed, 13 insertions(+), 68 deletions(-) New commits: commit 312b9a67f08de17f68ca971f4d640bc2df8de12e Author: Michael Weghorn AuthorDate: Mon Apr 15 10:53:46 2024 +0200 Commit: Michael Weghorn CommitDate: Mon Apr 15 20:06:34 2024 +0200 android: Update Android Gradle Plugin to 8.3.2 ... as suggested by Android Studio. Also update the Lint baseline file, as the build would otherwise fail due to this new warning: > Task :lintReportStrippedUIEditingDebug Wrote HTML report to file:///home/michi/development/git/libreoffice-WORKTREE-android/android/source/build/reports/lint-results-strippedUIEditingDebug.html > Task :lintStrippedUIEditingDebug FAILED /home/michi/development/git/libreoffice-WORKTREE-android/android/source/lint-baseline.xml: Information: 213 errors and 1 warning were filtered out because they are listed in the baseline file, lint-baseline.xml [LintBaseline] /home/michi/development/git/libreoffice-WORKTREE-android/android/source/lint-baseline.xml: Information: 6 errors/warnings were listed in the baseline file (lint-baseline.xml) but not found in the project; perhaps they have been fixed? Another possible explanation is that lint recently stopped analyzing (and including results from) dependent projects by default. You can turn this back on with android.lintOptions.checkDependencies=true. Unmatched issue types: PrivateResource, RedundantNamespace, TypographyEllipsis (3), UnusedNamespace [LintBaseline] /home/michi/development/git/libreoffice-WORKTREE-android/android/source/AndroidManifest.xml:109: Error: Should not restrict activity to fixed orientation. This may not be suitable for different form factors, causing the app to be letterboxed. [DiscouragedApi] android:screenOrientation="landscape" > ~ Explanation for issues of type "DiscouragedApi": Discouraged APIs are allowed and are not deprecated, but they may be unfit for common use (e.g. due to slow performance or subtle behavior). 1 errors, 0 warnings (213 errors, 1 warning filtered by baseline lint-baseline.xml) FAILURE: Build failed with an exception. Change-Id: I621b2334fef954bcd341cdde9034187f455339e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166114 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 090d73f49bfb..8cbef7744d8e 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -21,7 +21,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:8.2.1' +classpath 'com.android.tools.build:gradle:8.3.2' } } diff --git a/android/source/lint-baseline.xml b/android/source/lint-baseline.xml index 24e6447295e3..01fdd6f8d234 100644 --- a/android/source/lint-baseline.xml +++ b/android/source/lint-baseline.xml @@ -1,5 +1,5 @@ - + - - - - + + + + -http://schemas.android.com/apk/res/android; -errorLine2=" ~~"> - - - -http://schemas.android.com/apk/res/android; -errorLine2=" ~~"> - - - - - - - - - - - - - - -
core.git: android/source
android/source/res/values-cs/strings.xml | 54 +++ 1 file changed, 54 insertions(+) New commits: commit f4a497cbae8e35594f8d019bf8cef22639616da7 Author: Weblate AuthorDate: Wed Mar 13 20:36:50 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Wed Mar 13 21:05:38 2024 +0100 android-viewer translated using Weblate Czech currently translated at 100.0% (118 of 118 strings) Change-Id: I280354b2c931a3d16dd67979e8e47e85f5618955 Co-authored-by: Stanislav Horáček Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164790 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/android/source/res/values-cs/strings.xml b/android/source/res/values-cs/strings.xml index 8c8f522f62aa..ee3bf0bc0b66 100644 --- a/android/source/res/values-cs/strings.xml +++ b/android/source/res/values-cs/strings.xml @@ -64,4 +64,58 @@ Uložit jako… Ikona souboru Optimální šířka +OK +Zadejte dodatečnou délku v setinách mm +Tip: Optimální šířku/výšku nastavíte poklepáním na záhlaví. +Přidat list +OK +Zrušit +Zadejte heslo +Vyfotit +Vyberte fotku +Vyberte obrázek +Nenalezen fotoaparát +Nejmenší velikost +Střední velikost +Maximální kvalita +Nekomprimovat +Přejete si fotku zkomprimovat? +Vložit +Vyjmout +Přejmenovat list +Smazat list +Smazat snímek +Zadaný název se již používá. +Část byla smazána. +Příkaz UNO +Typ +Hodnota +Hodnota rodičovského +Exportovat do PDF +Tisk +Znak +Odstavec +Vložit +Styl +OK +Zrušit +Jazyk zobrazení +Nastaví výchozí jazyk zobrazení +Export do PDF dokončen +Export do PDF se nepodařil +Soubor se uložit nepodařilo +Chyba +Zadejte název části +Bmp je prázdný! +Stránka +List +Snímek +Část +Barva zvýraznění +Barva písma +Automatická +Název části byl změněn. +Aktuální příkaz UNO +Přejmenovat snímek +Kopírovat \ No newline at end of file
core.git: android/source
android/source/res/values-cs/strings.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit aa7f68514fa8a4c075b31d615379bf27df5e87bc Author: Weblate AuthorDate: Sun Feb 25 08:36:48 2024 +0100 Commit: Michael Weghorn CommitDate: Tue Feb 27 12:14:05 2024 +0100 android-viewer translated using Weblate Czech currently translated at 54.2% (64 of 118 strings) Change-Id: Ie43869edb7fffb61603b1a00cf3d2d01397c634e Co-authored-by: raal Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163900 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-cs/strings.xml b/android/source/res/values-cs/strings.xml index 303240269537..8c8f522f62aa 100644 --- a/android/source/res/values-cs/strings.xml +++ b/android/source/res/values-cs/strings.xml @@ -62,4 +62,6 @@ Najít další Najít předchozí Uložit jako… +Ikona souboru +Optimální šířka \ No newline at end of file
core.git: android/source
android/source/res/values-cs/strings.xml |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4a90f9044a6226088ab42744c226b6fa57b7cc3f Author: Weblate AuthorDate: Thu Feb 22 21:36:56 2024 +0100 Commit: Michael Weghorn CommitDate: Fri Feb 23 12:32:15 2024 +0100 android-viewer translated using Weblate Czech currently translated at 52.5% (62 of 118 strings) Change-Id: I867b990871692eb3947b48ca51e65716023bf6cc Co-authored-by: Stanislav Horáček Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163795 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-cs/strings.xml b/android/source/res/values-cs/strings.xml index 8b5ee9b30e55..303240269537 100644 --- a/android/source/res/values-cs/strings.xml +++ b/android/source/res/values-cs/strings.xml @@ -59,4 +59,7 @@ Upravit výšku Povolí experimentální režim úprav. Použití na vlastní nebezpečí. Optimální výška +Najít další +Najít předchozí +Uložit jako… \ No newline at end of file
core.git: android/source
android/source/res/values-gl/strings.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 42d147c9377705a917f69914e5fd79aa1e125762 Author: Weblate AuthorDate: Thu Feb 15 18:37:32 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Feb 15 21:21:05 2024 +0100 android-viewer translated using Weblate Galician currently translated at 100.0% (118 of 118 strings) Change-Id: Ibb3a34103ad2eee7e5f8ad4aa9f031fb28f9ca51 Co-authored-by: Xosé Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/gl/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163451 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/android/source/res/values-gl/strings.xml b/android/source/res/values-gl/strings.xml index b2b5cf2af947..3ad68bd82357 100644 --- a/android/source/res/values-gl/strings.xml +++ b/android/source/res/values-gl/strings.xml @@ -9,7 +9,7 @@ O Visor do LibreOffice é un visor de documentos baseado no LibreOffice. https://www.libreoffice.org Esta versión foi fornecida por $VENDOR. -"Este ficheiro só permite lectura." +Este ficheiro só permite lectura. Mostrar licenza Mostrar aviso Política de privacidade @@ -33,7 +33,7 @@ Gardar como… Buscar Enviar orde de UNO -A gardar o documento… +Gardar o documento… Fallou o gardado do documento. Desfacer Refacer @@ -87,7 +87,7 @@ Aceptar Cancelar Orde de UNO actual -Mostrar idioma +Idioma para mostrar Configurar o idioma predeterminado Rematou a exportación a PDF Non foi posíbel exportar a pdf @@ -100,7 +100,7 @@ Diapositiva Parte Cor de realce -Cor da letra +Cor do tipo de letra Renomear diapositiva Automático Versión: %1$sbrIdentificador da construción: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; @@ -114,7 +114,7 @@ Gardar o documento antes de pechar\? Cancelar Suxestión: Tocar dúas veces nunha cabeceira estabelece a largura/altura ideais. -Introduza o contrasinal +Introduza contrasinal Seleccionar imaxe Atrás Eliminar folla de cálculo
core.git: android/source
android/source/res/values-cs/strings.xml | 43 +++ android/source/res/values-sk/strings.xml | 22 +++ 2 files changed, 65 insertions(+) New commits: commit d527c6dca4513bf2f4267bd9e6f739532d7908d0 Author: Weblate AuthorDate: Wed Jan 24 19:37:05 2024 +0100 Commit: Michael Weghorn CommitDate: Thu Jan 25 11:29:33 2024 +0100 android-viewer translated using Weblate Slovak currently translated at 16.1% (19 of 118 strings) Change-Id: I43a99ef5228367157936337424f0b88893bba112 android-viewer translated using Weblate Czech currently translated at 50.0% (59 of 118 strings) Change-Id: I5335d1b9a25312708822ddf890fdb92c02891b25 Added translation for android-viewer using Weblate (Slovak) Change-Id: Icd19b09d4df30882fba4b26a7745419fe73233ba Co-authored-by: Miloš Šrámek Co-authored-by: Stanislav Horáček Co-authored-by: Weblate Co-authored-by: Weblate Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/sk/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162472 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-cs/strings.xml b/android/source/res/values-cs/strings.xml index 93d4ad5fc0b3..8b5ee9b30e55 100644 --- a/android/source/res/values-cs/strings.xml +++ b/android/source/res/values-cs/strings.xml @@ -16,4 +16,47 @@ Nová kresba bez názvu Nový sešit +Povolí vývojářský režim, ve kterém lze v aplikaci posílat příkazy UNO. Použití na vlastní nebezpečí. +Zobrazit +Vývojářský režim +Skrýt +Poslat příkaz UNO +O aplikaci +Povolit formát +Heslo +Vyberte možnosti vložení: +Zpět +ULOŽIT +Upravit délku +Vyberte soubor k otevření +Uložit dokument před zavřením? +Ukládání dokumentu selhalo. +Optimální délka +Znovu +Poslední soubory +Vložit +Ukládání dokumentu… +NE +Upravit šířku +Zpět +Experimentální režim +Smazat +Zpět +Části +Vyberte možnosti smazání: +Obecné +Text zkopírován do schránky +Zobrazit klávesnici +Prezentace +Hledat +Ukládání dokončeno +Uložit +Nastavení +Všechny soubory +Vložit tabulku +Přidat snímek +Zrušit +Upravit výšku +Povolí experimentální režim úprav. Použití na vlastní nebezpečí. +Optimální výška \ No newline at end of file diff --git a/android/source/res/values-sk/strings.xml b/android/source/res/values-sk/strings.xml new file mode 100644 index ..b83ec58936b9 --- /dev/null +++ b/android/source/res/values-sk/strings.xml @@ -0,0 +1,22 @@ + + +LibreOffice Viewer je prehliadač dokumentov založený na LibreOffice. +bez názvu +Info +https://www.libreoffice.org +Nový tabuľkový dokument +Vyberte súbor, ktorý chcete otvoriť +Nová kresba +Posledné súbory +Nový textový dokument +Nová prezentácia +Dodávateľom tohto produktu je $VENDOR. +Všeobecné +Nastavenia LibreOffice Viewer +Verzia: %1$sbrID zostavenia: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +Zobraziť licenciu +Všetky súbory +LibreOffice Viewer +Táto súbor je len na čítanie. +Zobraziť oznam + \ No newline at end of file
core.git: android/source
android/source/res/values-cs/strings.xml |8 ++ android/source/res/values-fa/strings.xml | 116 +++ android/source/res/values-in/strings.xml | 91 3 files changed, 214 insertions(+), 1 deletion(-) New commits: commit 73b4bbc371661df53717de59f84b056a206bc63f Author: Weblate AuthorDate: Sat Jan 20 08:37:06 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sun Jan 21 03:41:53 2024 +0100 android-viewer translated using Weblate Indonesian currently translated at 74.5% (88 of 118 strings) Change-Id: I613b96b66373aa9cb505da4de371b5b058e95f68 android-viewer translated using Weblate Czech currently translated at 13.5% (16 of 118 strings) Change-Id: Ie298906f2643a9e2df5c4e45183c99206d0aeda5 android-viewer translated using Weblate Persian currently translated at 100.0% (118 of 118 strings) Change-Id: I43d6ac950eb3bba2b6359184b063dd40d7d2f15b Co-authored-by: Andika Triwidada Co-authored-by: Hossein Co-authored-by: raal Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/fa/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/id/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162328 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/android/source/res/values-cs/strings.xml b/android/source/res/values-cs/strings.xml index 1cb7056b2d1a..93d4ad5fc0b3 100644 --- a/android/source/res/values-cs/strings.xml +++ b/android/source/res/values-cs/strings.xml @@ -8,4 +8,12 @@ Verze: %1$sbrID sestavení: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; Zobrazit licenci Tento soubor je pouze pro čtení. +Zobrazit upozornění +Zásady ochrany osobních údajů +Vytvořit nový soubor +Nový textový dokument +Nová prezentace +Nová kresba +bez názvu +Nový sešit \ No newline at end of file diff --git a/android/source/res/values-fa/strings.xml b/android/source/res/values-fa/strings.xml index 6fb2c62d5d9c..b307d00eeed2 100644 --- a/android/source/res/values-fa/strings.xml +++ b/android/source/res/values-fa/strings.xml @@ -2,4 +2,120 @@ تنظیمات نمایشگر لیبره آفیس نمایشگر لیبره آفیس +نسخه: %1$sbrشناسه ساخت: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +نمایشگر لیبره آفیس یک نمایشگر سند مبتنی بر لیبره آفیس است. +https://www.libreoffice.org +این نسخه توسط $VENDOR ارائه شده است. +این پرونده فقط خواندنی است. +پرونده را برای باز کردن انتخاب کنید +یافتن بعدی +درباره +اجزاء +تنظیمات +حالت برنامهنویس +حالت برنامهنویس را فعال کنید تا بتوانید دستورات UNO را در برنامه ارسال کنید. با مسئولیت خودتان استفاده کنید. +ارسال دستور UNO +ذخیره کردن کامل شد +ذخیره کردن سند… +بازگشت +حذف اسلاید +خطا +ذخیره به عنوان… +سند متنی جدید +ارائه جدید +صفحه گسترده جدید +طراحی جدید +بدون عنوان +شمایل پرونده +همه پروندهها +عمومی +حالت آزمایشی +نمایش صفحه کلید +ذخیره +سیاست حریم خصوصی +ایجاد پرونده جدید +یافتن قبلی +جستجو +ذخیره کردن سند ناموفق بود. +رمز عبور +واگردان +آیا سند قبل از بستن ذخیره شود؟ +ذخیره +لغو +خیر +افزودن اسلاید +درج +حذف +پنهان کردن +نمایش +طول بهینه +تنظیم طول +تنظیم ارتفاع +تنظیم عرض +عرض بهینه +باشد +طول اضافی را در واحد 100 تا در میلیمتر وارد کنید +افزودن کاربرگ +باشد +لغو +لطفاً رمز عبور را وارد کنید +عکس گرفتن +انتخاب عکس +انتخاب تصویر +هیچ دوربینی یافت نشد +کوچکترین اندازه +اندازه متوسط +فشرده نکن +چسباندن +برش +بازگشت +درج جدول +گزینههای حذف را انتخاب کنید: +تغییر نام کاربرگ +حذف کاربرگ +نام داده شده پیش از این در حال استفاده است. +نام جزء تغییر کرده است. +جزء حذف شده است. +دستور UNO +نوع +مقدار +مقدار والد +چاپ +نویسه +بند +درج +سبک +باشد +لغو +دستورات UNO فعلی +زبان نمایش +صدور به PDF پایان یافت +صدور به PDF ممکن نبود +ذخیره پرونده ممکن نبود +نام یک جزء را وارد کنید +Bmp تهی است! +صفحه +برگه +جزء +رنگ برجسته کردن +تغییر نام اسلاید +خودکار +فعال کردن قالب +نمایش اجازهنامهها +نمایش اطلاعیه +پروندههای اخیر +حالت آزمایشی ویرایش را فعال کنید. با مسئولیت خودتان استفاده کنید. +انجام دوباره +نمایش اسلاید +ارتفاع بهینه +کیفیت بیشینه +نکته: دوبار ضربه زدن روی سرایند عرض/ارتفاع بهینه را تنظیم میکند. +آیا میخواهید عکس را فشرده کنید؟ +کپی +اسلاید +متن در تخته کپی شد +گزینههای درج را انتخاب کنید: +صدور به PDF +زبان نمایش پیشفرض را تنظیم
core.git: android/source
android/source/gradle/wrapper/gradle-wrapper.jar|binary android/source/gradle/wrapper/gradle-wrapper.properties |5 +- android/source/gradlew | 30 +++- android/source/gradlew.bat | 15 4 files changed, 34 insertions(+), 16 deletions(-) New commits: commit 89e7c04ba48dab824e9f291d7db38dac6ffd6b19 Author: Michael Weghorn AuthorDate: Mon Jan 15 11:34:32 2024 +0100 Commit: Michael Weghorn CommitDate: Tue Jan 16 17:27:54 2024 +0100 android: Update gradle + wrapper to 8.5 Commit the result of running ./gradlew wrapper --distribution-type all --gradle-version 8.5 --gradle-distribution-sha256-sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b (minus the automatically added `networkTimeout=1` in `android/source/gradle/wrapper/gradle-wrapper.properties`). This includes the following upstream change for gradle to port from the use of `which` to the more portable `command -v`: [1] Thanks to Eli Schwartz for pointing this out in his previous Gerrit change [2] that was suggesting to only backport that particular change to the wrapper script. [1] https://github.com/gradle/gradle/pull/23961 [2] https://gerrit.libreoffice.org/c/core/+/160667 Change-Id: I1c230c75d2d8583852c59ff43ddfdf77daf5d5ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162081 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/gradle/wrapper/gradle-wrapper.jar b/android/source/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4f..033e24c4cdf4 100644 Binary files a/android/source/gradle/wrapper/gradle-wrapper.jar and b/android/source/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index ec719b3ea19d..cdea548c75ee 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip +distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/source/gradlew b/android/source/gradlew index 1b6c787337ff..fcb6fca147c0 100755 --- a/android/source/gradlew +++ b/android/source/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java -which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." +fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6
core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15eda65d04250434c099f953b2fea9a5325c5fb5 Author: Michael Weghorn AuthorDate: Wed Jan 10 10:22:42 2024 +0100 Commit: Michael Weghorn CommitDate: Mon Jan 15 11:14:53 2024 +0100 android: Update Android Gradle Plugin to 8.2.1 This was suggested by Android Studio. Change-Id: I7278ce5e5b21477459e40a315912c846ec9b6d57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161882 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 009e9b59a742..69c7785c0179 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -21,7 +21,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:8.2.0' +classpath 'com.android.tools.build:gradle:8.2.1' } }
core.git: android/source
android/source/res/values-ab/strings.xml |2 + android/source/res/values-cs/strings.xml |6 + android/source/res/values-it/strings.xml | 34 +++ 3 files changed, 25 insertions(+), 17 deletions(-) New commits: commit 846a032ebd0859f4f52ca97741a2efa566fa9432 Author: Weblate AuthorDate: Thu Jan 11 09:18:48 2024 +0100 Commit: Michael Weghorn CommitDate: Fri Jan 12 09:39:43 2024 +0100 Added translation for android-viewer using Weblate (Abkhazian) Change-Id: I773dd0a06ea44d9978cbb9b169545ef8bd456c6d android-viewer translated using Weblate Italian currently translated at 100.0% (118 of 118 strings) Change-Id: I98f0567a3b5b2fa853b468dfb1aec21230527b42 android-viewer translated using Weblate Italian currently translated at 100.0% (118 of 118 strings) Change-Id: I87ee3f9f46342bc1a4c3c4062a74a7c7afb9b3f9 android-viewer translated using Weblate Czech currently translated at 6.7% (8 of 118 strings) Change-Id: I61735dcce61a859b45619b9b2742220f00ec94bc android-viewer translated using Weblate Italian currently translated at 99.1% (117 of 118 strings) Change-Id: I867af2d187ff54c701d6ec3a2f6b7114acb55aba Co-authored-by: Elisabetta Manuele Co-authored-by: Stanislav Horáček Co-authored-by: Valter Mura Co-authored-by: Weblate Co-authored-by: Андрей Абухба Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/it/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161721 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-ab/strings.xml b/android/source/res/values-ab/strings.xml new file mode 100644 index ..a6b3daec9354 --- /dev/null +++ b/android/source/res/values-ab/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/android/source/res/values-cs/strings.xml b/android/source/res/values-cs/strings.xml index f508d4e9f63d..1cb7056b2d1a 100644 --- a/android/source/res/values-cs/strings.xml +++ b/android/source/res/values-cs/strings.xml @@ -2,4 +2,10 @@ LibreOffice Viewer Nastavení LibreOffice Viewer +LibreOffice Viewer je prohlížeč dokumentů založený na LibreOffice. +https://www.libreoffice.org +Toto vydání bylo dodáno společností $VENDOR. +Verze: %1$sbrID sestavení: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +Zobrazit licenci +Tento soubor je pouze pro čtení. \ No newline at end of file diff --git a/android/source/res/values-it/strings.xml b/android/source/res/values-it/strings.xml index 0e7aa6bc0287..35dade166124 100644 --- a/android/source/res/values-it/strings.xml +++ b/android/source/res/values-it/strings.xml @@ -2,11 +2,11 @@ Impostazioni del Visualizzatore di LibreOffice https://it.libreoffice.org/ -Versione viene fornita da $VENDOR. +Versione fornita da $VENDOR. Questo file è di sola lettura. Mostra licenza Visualizzatore di LibreOffice -Il Visualizzatore di LibreOffice è un visualizzatore di documenti basato su LibreOffice. +Il Visualizzatore di LibreOffice è un\'app per visualizzare i documenti basata su LibreOffice. Mostra avviso Nuovo documento di testo Nuova presentazione @@ -47,28 +47,28 @@ Annulla Crea nuovo file Diapositiva -Il nome della parte è stato cambiato. +Il nome della parte è stato modificato. Massima qualità Nascondi -Scegli le opzioni di inserimento: +Scegli opzioni di inserimento: Tipo -Comando UNO corrente +Comando UNO attuale Indietro -Il file Bitmap è vuoto! +File Bitmap non valido. Incolla OK Regola la lunghezza Parte Impossibile esportare in PDF Salva con nome… -Colore tipo di carattere +Colore carattere Rinomina foglio di lavoro Lunghezza ottimale Inserisci un nome per la parte Automatico Elimina diapositiva Taglia -fileicon +iconafile Pagina Inserisci Inserisci lunghezza aggiuntiva in centesimi di millimetro @@ -84,19 +84,19 @@ Indietro Elimina La parte è stata eliminata. -Inserisci la password +Inserisci password OK Dimensione media -Imposta la lingua di visualizzazione predefinita -Scegli le opzioni di eliminazione: +Imposta lingua di visualizzazione predefinita +Scegli opzioni di eliminazione: Testo copiato negli appunti Esporta in PDF Rinomina diapositiva -Politica di riservatezza -Valore genitore -Dimensione più piccola +Informativa sulla riservatezza +Valore padre +Dimensione minima Seleziona foto -Non comprimere +Nessuna
core.git: android/source
android/source/res/values-es/strings.xml |2 android/source/res/values-hu/strings.xml | 58 ++ android/source/res/values-it/strings.xml | 76 +++ android/source/res/values-pt/strings.xml | 121 +++ 4 files changed, 256 insertions(+), 1 deletion(-) New commits: commit 3a561a29cfae0b6dbdf56eed3a730bdd85fe049b Author: Weblate AuthorDate: Wed Jan 3 11:36:49 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Fri Jan 5 13:39:34 2024 +0100 android-viewer translated using Weblate Spanish currently translated at 100.0% (118 of 118 strings) Change-Id: Ic665ce7eb865fc0755c9b295229f5dca8ed83ae3 android-viewer translated using Weblate Portuguese currently translated at 100.0% (118 of 118 strings) Change-Id: I4112a335ac15c56464fd121d081d31bb6865 Added translation for android-viewer using Weblate (Portuguese) Change-Id: Ifab7260e34b78fcbc9344d79807aa551416b4db2 android-viewer translated using Weblate Hungarian currently translated at 100.0% (118 of 118 strings) Change-Id: Ia4cb99b091c1035ccd1952e0bfb164e986381418 android-viewer translated using Weblate Italian currently translated at 94.0% (111 of 118 strings) Change-Id: I1c1d672a34b8684b5cb17215d0575a91c2c067a6 Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Gábor Kelemen Co-authored-by: Sérgio Marques Co-authored-by: Valter Mura Co-authored-by: Weblate Co-authored-by: Weblate Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/es/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/hu/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/it/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/pt/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161457 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/android/source/res/values-es/strings.xml b/android/source/res/values-es/strings.xml index 5cae3ef36c31..0dbbf6fbf522 100644 --- a/android/source/res/values-es/strings.xml +++ b/android/source/res/values-es/strings.xml @@ -97,7 +97,7 @@ Cancelar Orden UNO actual Mostrar en idioma -Establecer el idioma para mostrar predeterminado +Establecer el idioma en pantalla predeterminado Terminó la exportación a PDF No se pudo exportar a PDF No se pudo guardar el archivo diff --git a/android/source/res/values-hu/strings.xml b/android/source/res/values-hu/strings.xml index 517c8c87d579..49ef9910e435 100644 --- a/android/source/res/values-hu/strings.xml +++ b/android/source/res/values-hu/strings.xml @@ -60,4 +60,62 @@ A fájl csak olvasható. Megjegyzés megjelenítése Optimális magasság +PDF export kész +Mégse +Dia +Rész neve módosítva. +Max minőség +Válasszon beszúrási lehetőséget: +Típus +Jelenlegi UNO parancs +A BMP null! +Beillesztés +OK +Rész +Nem lehet exportálni PDF-be +Betűszín +Munkalap átnevezése +Írjon be egy résznevet +Automatikus +Dia törlése +Kivágás +Oldal +Extra hossz megadása 1/100 mm-ben +Stílus +Kép kiválasztása +Munkalap törlése +Kiemelési szín +Nyomtatás +Munkalap hozzáadása +Bekezdés +Vissza +Rész törölve. +Írja be a jelszót +Közepes méret +Alapértelmezett nyelv beállítása +Válasszon törlési lehetőségeket: +Szöveg vágólapra másolva +PDF-be exportálás +Dia átnevezése +Szülő érték +Legkisebb méret +Fénykép kiválasztása +Ne tömörítse +Másolás +Beszúrás +Nem található kamera +Hiba +Ez a név már használatban van. +UNO parancs +OK +Érték +Munkalap +Szeretné tömöríteni a fényképet\? +Fényképezés +Nem lehet menteni a fájlt +Táblázat beszúrása +Megjelenítési nyelv +Mégse +Karakter +Koppintson duplán a fejlécre optimális szélesség/magasság beállításához. \ No newline at end of file diff --git a/android/source/res/values-it/strings.xml b/android/source/res/values-it/strings.xml index 3fbcef2881ab..0e7aa6bc0287 100644 --- a/android/source/res/values-it/strings.xml +++ b/android/source/res/values-it/strings.xml @@ -42,4 +42,80 @@ Salva Attiva formato Salvare il documento prima di chiuderlo\? +Esportazione in PDF terminata +Mostra +Annulla +Crea nuovo file +Diapositiva +Il nome della parte è stato cambiato. +Massima qualità +Nascondi +Scegli le opzioni di inserimento: +Tipo +Comando UNO corrente +Indietro +Il file Bitmap è vuoto! +Incolla +OK +Regola la lunghezza +Parte +
core.git: android/source
android/source/res/values-hu/strings.xml | 63 +++ 1 file changed, 63 insertions(+) New commits: commit 6fe0a54f5503cca07b3c0c75e2c4fbc7aece2901 Author: Weblate AuthorDate: Wed Dec 27 23:37:06 2023 +0100 Commit: Michael Weghorn CommitDate: Sat Dec 30 23:01:39 2023 +0100 android-viewer translated using Weblate Hungarian currently translated at 50.8% (60 of 118 strings) Change-Id: I827a786aca47cb057e3c822d04aba13906ebef2d Added translation for android-viewer using Weblate (Hungarian) Change-Id: Ic660281a13f5b4a1ad0d0bd35618038d143c1994 Co-authored-by: Gábor Kelemen Co-authored-by: Weblate Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/hu/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161304 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-hu/strings.xml b/android/source/res/values-hu/strings.xml new file mode 100644 index ..517c8c87d579 --- /dev/null +++ b/android/source/res/values-hu/strings.xml @@ -0,0 +1,63 @@ + + +Fejlesztői mód engedélyezése, ahol UNO parancsokat küldhet az alkalmazásnak. Saját felelősségre használja. +A LibreOffice Viewer egy LibreOffice-alapú dokumentummegjelenítő. +Megjelenítés +Fejlesztői mód +Új fájl létrehozása +Elrejtés +UNO parancs küldése +névtelen +Névjegy +Formázás engedélyezése +Jelszó +https://www.libreoffice.org +Vissza +MENTÉS +Hossz igazítása +Új táblázat +Fájl kiválasztása +Mentés másként… +Bezárás előtt menti a dokumentumot\? +A dokumentum mentése meghiúsult. +Optimális hossz +Új rajz +Újra +fájl ikon +Legutóbbi fájlok +Beszúrás +Dokumentum mentése… +Optimális szélesség +NEM +Új szöveges dokumentum +Szélesség igazítása +Új bemutató +Kísérleti mód +Törlés +Vissza +A kiadást készítette: $VENDOR. +OK +Részek +Általános +Billentyűzet megjelenítése +Adatvédelem +Diavetítés +Keresés +Mentés kész +LibreOffice Viewer beállításai +Mentés +Beállítások +Verzió: %1$sbrBuild ID: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +Licenc megjelenítése +Minden fájl +LibreOffice Viewer +Dia hozzáadása +Mégse +Magasság igazítása +Következő találat +Előző találat +Kísérleti szerkesztőmód bekapcsolása. Saját felelősségre használja. +A fájl csak olvasható. +Megjegyzés megjelenítése +Optimális magasság + \ No newline at end of file
core.git: android/source
android/source/res/values-ast/strings.xml |2 android/source/res/values-de/strings.xml |3 android/source/res/values-eu/strings.xml |2 android/source/res/values-fr/strings.xml | 80 +++ android/source/res/values-gl/strings.xml |2 android/source/res/values-it/strings.xml | 28 ++ android/source/res/values-nl/strings.xml | 121 +- android/source/res/values-pa/strings.xml | 12 ++ android/source/res/values-tr/strings.xml |8 + 9 files changed, 253 insertions(+), 5 deletions(-) New commits: commit 11fcb2814ee44e4f9b932e879bb95206e3dbf875 Author: Weblate AuthorDate: Mon Dec 25 05:37:03 2023 +0100 Commit: Michael Weghorn CommitDate: Mon Dec 25 18:13:40 2023 +0100 android-viewer translated using Weblate Dutch currently translated at 100.0% (118 of 118 strings) Change-Id: I59c75900254b4124ff7dc8397a943908404e0a5c android-viewer translated using Weblate Italian currently translated at 35.5% (42 of 118 strings) Change-Id: I73561c67beafb4896d7b2301d1b3970eb030 android-viewer translated using Weblate Asturian currently translated at 100.0% (118 of 118 strings) Change-Id: I83e753b66c856b4fa39cba5bf1de1e44616b1cba android-viewer translated using Weblate Basque currently translated at 100.0% (118 of 118 strings) Change-Id: I6e956873841380aabd1351dbbd07f3466ba28275 android-viewer translated using Weblate French currently translated at 100.0% (118 of 118 strings) Change-Id: I1af1d53bd1daaab3bd0404d8fe75b92e5923b9e2 android-viewer translated using Weblate Punjabi currently translated at 95.7% (113 of 118 strings) Change-Id: I7582795194c21cc6c954884bd4612e9cefc01308 android-viewer translated using Weblate Galician currently translated at 100.0% (118 of 118 strings) Change-Id: Ica6acf55e43ec98648b021b9f38871aedf2581fa android-viewer translated using Weblate Turkish currently translated at 100.0% (118 of 118 strings) Change-Id: If8639fcaf3b5b0447c0b00f5fe85ed55d0bb7cad android-viewer translated using Weblate German currently translated at 100.0% (118 of 118 strings) Change-Id: I0c5795094434899569e18ae6d87c4bed2e10ea01 Co-authored-by: A S Alam Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Aitor Salaberria Co-authored-by: Ayhan YALÇINSOY Co-authored-by: Christian Kühl Co-authored-by: Elisabetta Manuele Co-authored-by: Xosé Co-authored-by: kees538 Co-authored-by: sophie Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ast/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/de/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/eu/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/fr/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/gl/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/it/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/nl/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/pa/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/tr/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161274 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Jenkins diff --git a/android/source/res/values-ast/strings.xml b/android/source/res/values-ast/strings.xml index cf1790dcab12..27e9d06bd131 100644 --- a/android/source/res/values-ast/strings.xml +++ b/android/source/res/values-ast/strings.xml @@ -74,7 +74,7 @@ Tamañu menor Tamañu mediu Calidá máxima -Non comprimir +Nun comprimir ¿Quies comprimir la foto\? Copia Apegar diff --git a/android/source/res/values-de/strings.xml b/android/source/res/values-de/strings.xml index e5d3d8184853..61f03c9bd63c 100644 --- a/android/source/res/values-de/strings.xml +++ b/android/source/res/values-de/strings.xml @@ -136,4 +136,7 @@ Schriftfarbe Folie umbenennen Automatisch +Neue Datei erstellen +Nächste suchen +Vorherige suchen \ No newline at end of file diff --git a/android/source/res/values-eu/strings.xml b/android/source/res/values-eu/strings.xml index 83bebbde2c51..660fce1fb581 100644 --- a/android/source/res/values-eu/strings.xml +++ b/android/source/res/values-eu/strings.xml @@ -31,7 +31,7 @@ Zatiak Erakutsi teklatua Gorde -Gorde honela... +Gorde honela… Gaitu
core.git: android/source
android/source/res/values-ast/strings.xml| 95 + android/source/res/values-cy/strings.xml |2 android/source/res/values-el/strings.xml | 121 +++ android/source/res/values-in/strings.xml |2 android/source/res/values-it/strings.xml |7 + android/source/res/values-ne/strings.xml | 23 + android/source/res/values-sl/strings.xml |2 android/source/res/values-uk/strings.xml | 121 ++- android/source/res/values-zh-rTW/strings.xml | 121 ++- 9 files changed, 490 insertions(+), 4 deletions(-) New commits: commit 78e72be805e9b41617d752e0da8c04b7bf5dd269 Author: Weblate AuthorDate: Tue Dec 19 09:16:25 2023 +0100 Commit: Michael Weghorn CommitDate: Tue Dec 19 22:51:13 2023 +0100 Added translation for android-viewer using Weblate (Indonesian) Change-Id: I55e7159ff10e7bb0ee32651a8f23f2f3a4e1282c android-viewer translated using Weblate Asturian currently translated at 100.0% (118 of 118 strings) Change-Id: Ica863fed7663f5f5c17820a4010262101fcc358c android-viewer translated using Weblate Nepali currently translated at 16.9% (20 of 118 strings) Change-Id: Ifc64ae37b7faa5bad89f70178565595630993420 android-viewer translated using Weblate Greek currently translated at 100.0% (118 of 118 strings) Change-Id: Icb257e6a5cfd38de5a27425f69294e059796e596 android-viewer translated using Weblate Ukrainian currently translated at 100.0% (118 of 118 strings) Change-Id: Iddf1e095b789f2a324fbc614d57b98ab3df8ed0e android-viewer translated using Weblate Asturian currently translated at 100.0% (118 of 118 strings) Change-Id: I318be3807e77e190d857f1d9edd25fc9d7a60c0a android-viewer translated using Weblate Asturian currently translated at 100.0% (118 of 118 strings) Change-Id: If8105733d78073254da1ccd16817581d53ab55b8 android-viewer translated using Weblate Chinese (Traditional) currently translated at 100.0% (118 of 118 strings) Change-Id: I7ef697098031684e32aed137b2ac6bd844ed94fb Added translation for android-viewer using Weblate (Nepali) Change-Id: I2d68cb2696827a6cd6e2ad634873857344c8ac9f android-viewer translated using Weblate Greek currently translated at 57.6% (68 of 118 strings) Change-Id: Ic029d631692c1f47a9d7eeda13ce6ac38a59c3b8 android-viewer translated using Weblate Greek currently translated at 56.7% (67 of 118 strings) Change-Id: Id3456928ecb1a9aab0c27e77fbe49a02540fd8c4 android-viewer translated using Weblate Asturian currently translated at 58.4% (69 of 118 strings) Change-Id: Ibaf90837a1f25d070f9dd8ac183fbca6c26e85c4 android-viewer translated using Weblate Italian currently translated at 11.8% (14 of 118 strings) Change-Id: I64eb0e5cbf5a6ab050c6ef18a1adae68317005d8 android-viewer translated using Weblate Asturian currently translated at 32.2% (38 of 118 strings) Change-Id: Ie470cf5f249a0e498413571cd0b56a5421f5710a android-viewer translated using Weblate Asturian currently translated at 32.2% (38 of 118 strings) Change-Id: I687ae9fe76f85a03f0876f4eda55d943f51b43fb android-viewer translated using Weblate Slovenian currently translated at 100.0% (118 of 118 strings) Change-Id: I0c0cc15c6d5f245311c12d05afd4742db649389d android-viewer translated using Weblate Chinese (Traditional) currently translated at 100.0% (118 of 118 strings) Change-Id: I2ddc5b6a36a512e6e4d1e52c96e282b0ff05f2ea android-viewer translated using Weblate Welsh currently translated at 100.0% (118 of 118 strings) Change-Id: I34dbcafeaf61e7400d07910976ff71fdbe8ae4b0 Added translation for android-viewer using Weblate (Greek) Change-Id: Idfc6ee0a0988f3c414e6e6beee58a96ab5fb9547 Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Andika Triwidada Co-authored-by: Cheng-Chia Tseng Co-authored-by: Dimitris Spingos Co-authored-by: Elisabetta Manuele Co-authored-by: Martin Srebotnjak Co-authored-by: Po-Yen Huang Co-authored-by: Rhoslyn Prys Co-authored-by: Saroj Dhakal Co-authored-by: Weblate Co-authored-by: Weblate Co-authored-by: Xandru Martino Ruz Co-authored-by: Євген Кондратюк Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ast/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cy/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/el/ Translate-URL:
core.git: android/source
android/source/res/values-ast/strings.xml| 26 + android/source/res/values-cs/strings.xml |5 + android/source/res/values-dsb/strings.xml| 121 +++ android/source/res/values-fr/strings.xml | 36 android/source/res/values-hsb/strings.xml| 121 +++ android/source/res/values-hy/strings.xml | 18 ++-- android/source/res/values-is/strings.xml | 121 +++ android/source/res/values-it/strings.xml | 10 ++ android/source/res/values-nl/strings.xml |2 android/source/res/values-pl/strings.xml |2 android/source/res/values-pt-rBR/strings.xml | 60 + android/source/res/values-uk/strings.xml |2 12 files changed, 513 insertions(+), 11 deletions(-) New commits: commit 5e3a3671596ea4f8aaecd8e1b428bcc63a627e2d Author: Weblate AuthorDate: Sun Dec 17 17:52:01 2023 +0100 Commit: Michael Weghorn CommitDate: Sun Dec 17 21:39:05 2023 +0100 android-viewer translated using Weblate Lower Sorbian currently translated at 100.0% (118 of 118 strings) Change-Id: Ic20ccfbdde8de842548b79e3b5dfde85f300dc90 android-viewer translated using Weblate Upper Sorbian currently translated at 100.0% (118 of 118 strings) Change-Id: Iddaca4eedc9f022377c81929814856c31067f50d android-viewer translated using Weblate Italian currently translated at 5.9% (7 of 118 strings) Change-Id: I9e0f677f79c7496211959a3360eb166af6226aee Added translation for android-viewer using Weblate (Ukrainian) Change-Id: I130f051543b758544ac3b2a069899870ac16058d android-viewer translated using Weblate Upper Sorbian currently translated at 100.0% (118 of 118 strings) Change-Id: I8655aa3d29866b006f839c93d242332e1102fb4a android-viewer translated using Weblate Czech currently translated at 1.6% (2 of 118 strings) Change-Id: Ib3f028432a47679478f17cadcf031f425293e745 Added translation for android-viewer using Weblate (Lower Sorbian) Change-Id: I1978530538c3808b939729c15fd9a16ed2ab8b3d android-viewer translated using Weblate Icelandic currently translated at 100.0% (118 of 118 strings) Change-Id: Ib7f514c6082fe1b85f6c40f70024cefab8f4b103 android-viewer translated using Weblate Asturian currently translated at 19.4% (23 of 118 strings) Change-Id: I726ac83b54a25b2c12747992f425ac713e33825d android-viewer translated using Weblate Portuguese (Brazil) currently translated at 100.0% (118 of 118 strings) Change-Id: Ib03330ad83be7cd6bf01f99a51870b5eb5c0a316 android-viewer translated using Weblate Armenian currently translated at 100.0% (118 of 118 strings) Change-Id: Idbdaeed85c0cbcfb037de074d34558c10fd978bb Added translation for android-viewer using Weblate (Upper Sorbian) Change-Id: I2f5ca2465e7d788f290656f728da1a3ed001ba19 Added translation for android-viewer using Weblate (Dutch) Change-Id: I9cfed846807c16dd7c9c92d32ada641d89082579 Added translation for android-viewer using Weblate (Icelandic) Change-Id: I120a3e1603867ae60b25531686dbbac5a8086bf2 Added translation for android-viewer using Weblate (Italian) Change-Id: I16661f95066ee125409b7e939721b0070c59cf2d Added translation for android-viewer using Weblate (Asturian) Change-Id: I561826cd41e1de13f8c683a9ffe005cccb2e1246 android-viewer translated using Weblate Czech currently translated at 0.8% (1 of 118 strings) Change-Id: I1fbb418d0c82e587e56dca7b1e751f05fbe256e9 android-viewer translated using Weblate Polish currently translated at 100.0% (118 of 118 strings) Change-Id: I4d9f8bf30b3a084940356258ae929bf061dba129 android-viewer translated using Weblate French currently translated at 32.2% (38 of 118 strings) Change-Id: I327ef925fc254142b4668385a79f502ef0bb888d Added translation for android-viewer using Weblate (Czech) Change-Id: I1215d7ba1a3d4fac3ebf00de9d55ef31753a356e Co-authored-by: Adam Rak Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Elisabetta Manuele Co-authored-by: Michael Wolf Co-authored-by: Olivier Hallot Co-authored-by: Stanislav Horáček Co-authored-by: Sveinn í Felli Co-authored-by: Tigran Zargaryan Co-authored-by: Weblate Co-authored-by: Weblate Co-authored-by: raal Co-authored-by: sophie Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ast/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/dsb/
core.git: android/source
android/source/res/values-ca/strings.xml | 56 ++-- android/source/res/values-cy/strings.xml | 14 --- android/source/res/values-de/strings.xml | 14 --- android/source/res/values-es/strings.xml | 14 --- android/source/res/values-eu/strings.xml | 121 +++ android/source/res/values-fa/strings.xml |5 + android/source/res/values-fi/strings.xml |2 android/source/res/values-fr/strings.xml |5 + android/source/res/values-gl/strings.xml | 14 --- android/source/res/values-hy/strings.xml | 14 --- android/source/res/values-ja/strings.xml |2 android/source/res/values-pa/strings.xml | 108 +++- android/source/res/values-pl/strings.xml | 121 +++ android/source/res/values-pt-rBR/strings.xml | 63 ++ android/source/res/values-sl/strings.xml | 121 +++ android/source/res/values-tr/strings.xml | 14 --- android/source/res/values-zh-rTW/strings.xml |2 17 files changed, 598 insertions(+), 92 deletions(-) New commits: commit f65ef4517a2d8bf8959871501daa06bcea73a570 Author: Weblate AuthorDate: Fri Dec 15 17:28:23 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 15 20:48:01 2023 +0100 Update translation files for android-viewer Updated by "Cleanup translation files" hook in Weblate. Change-Id: Ie0d7d835fba42e9a8cfb73370a8b153168a9cf9e android-viewer translated using Weblate Slovenian currently translated at 100.0% (132 of 132 strings) Change-Id: Id07e5c018310b97460f7750c2db2f43127c483c5 Added translation for android-viewer using Weblate (Slovenian) Change-Id: Ie9008b437173feb5a871e119fd00e5f134dd0da9 android-viewer translated using Weblate Polish currently translated at 100.0% (132 of 132 strings) Change-Id: Iacacacd662c48986358e904598d458c44ca8805f Added translation for android-viewer using Weblate (Japanese) Change-Id: I3373654075eabc79c42cd2c67daf62f5f758 Added translation for android-viewer using Weblate (Chinese (Traditional)) Change-Id: I7af06e08b6567f990641ad532b8b94df2ec7d367 android-viewer translated using Weblate Basque currently translated at 100.0% (132 of 132 strings) Change-Id: I9b29af97d0642fa36c09ce38bf14290f60ccb8cd android-viewer translated using Weblate Polish currently translated at 100.0% (132 of 132 strings) Change-Id: Ie0b345d1dc63102120cb871f8066ed710917e72f android-viewer translated using Weblate Portuguese (Brazil) currently translated at 54.5% (72 of 132 strings) Change-Id: I652b6dde8cd02c9b4baff5ba5453f7471f8eb896 android-viewer translated using Weblate Catalan currently translated at 100.0% (132 of 132 strings) Change-Id: Ic7b42998072d6bb02937e88af76620564abc51b8 Added translation for android-viewer using Weblate (Finnish) Change-Id: Iae55f9b007d7d34162d77c8f62d025fa54ff8035 Added translation for android-viewer using Weblate (Basque) Change-Id: I88291444f52d5f4189c17330f855683268a2bffc android-viewer translated using Weblate Catalan currently translated at 62.1% (82 of 132 strings) Change-Id: I28ec1b2f54d39209f7d802ba9aa899d12b2a3b35 android-viewer translated using Weblate Persian currently translated at 2.2% (3 of 132 strings) Change-Id: I7ba58594540aff2ad592771e73efeeccdff027db android-viewer translated using Weblate Portuguese (Brazil) currently translated at 33.3% (44 of 132 strings) Change-Id: I092277ffea906ad3da9b73e7831536a482bb104f android-viewer translated using Weblate French currently translated at 1.5% (2 of 132 strings) Change-Id: Ia8553c387bec6c66c6def3de9b4b41016ead2bb1 Added translation for android-viewer using Weblate (Polish) Change-Id: Ibe83470b27b286030024f654df5cf30b2cb727ed Added translation for android-viewer using Weblate (Persian) Change-Id: I67bb9684aaa873ca4129139fb340b84634c9fe7e android-viewer translated using Weblate Portuguese (Brazil) currently translated at 20.4% (27 of 132 strings) Change-Id: I628da41052ac2957601226a5e03796bd67744863 Added translation for android-viewer using Weblate (Portuguese (Brazil)) Change-Id: I8ee44239235aaba0c44f805d93d2cb8db4383fab android-viewer translated using Weblate Punjabi currently translated at 87.8% (116 of 132 strings) Change-Id: Ic9ae2d4d5d007638ecf8d58c9069c103d30af7c1 android-viewer translated using Weblate Catalan currently translated at 59.0% (78 of 132 strings) Change-Id: Ib6d7f7e1adf85c57f6de66cf21795c27d6945a03 Added translation for android-viewer using Weblate
core.git: android/source
android/source/res/layout/about.xml |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit d942b4a7d187f106dfb1f5085e7c655bf13974bf Author: Michael Weghorn AuthorDate: Fri Dec 15 12:37:39 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 15 17:28:28 2023 +0100 android: Set sample texts for design view As cloph suggested in [1], set sample texts for the version and vendor information in the About dialog, using the `tools:text` attribute as described at [2]. These are displayed when viewing the layout in Android Studio's layout preview. With these placeholder texts, this gives a better impression at design time what the actual result will look like at runtime. The actual texts for the view are set at runtime, s. `AboutDialogFragment#onCreateDialog`. [1] https://gerrit.libreoffice.org/c/core/+/160047/comments/52584e2e_50869bef [2] https://developer.android.com/studio/write/tool-attributes#design-time_view_attributes Change-Id: I92b1c3d9f947fd1aa68a3ef4f0eee9e5c742e0c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160826 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/layout/about.xml b/android/source/res/layout/about.xml index 30f1ed3d95ae..f37482b82a0c 100644 --- a/android/source/res/layout/about.xml +++ b/android/source/res/layout/about.xml @@ -1,9 +1,10 @@ http://schemas.android.com/apk/res/android; +xmlns:tools="http://schemas.android.com/tools; android:layout_width="match_parent" android:layout_height="match_parent"> -http://schemas.android.com/apk/res/android; + +android:textSize="18sp" +tools:text="Version: x.x.x.x\nBuild ID: " /> +android:textSize="18sp" +tools:text="@string/app_vendor" />
core.git: android/source
android/source/build.gradle | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit eaa8327c960591bf113f624be2fc81af00d08090 Author: Michael Weghorn AuthorDate: Fri Dec 15 08:35:45 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 15 17:27:05 2023 +0100 android lint: Ignore missing translations Translations are handled in Weblate now, so missing translations are tracked there. Therefore, ignore them in the lint check, since there's no added value in having them listed in the `android/source/lint-baseline.xml` file in addition any more. Change-Id: I82945c0eebe015ca9695813dd19613108884c648 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160816 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index ce7bba57633b..b89efc3d00fd 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -90,9 +90,13 @@ android { } lint { warningsAsErrors true -// don't error-out on missing translations or external updates (new translations, -// new gradle plugin, library versions or target API become available) -informational 'AndroidGradlePluginVersion', 'GradleDependency', 'MissingTranslation', 'NewerVersionAvailable', 'OldTargetApi', 'TypographyEllipsis' +// ignore missing translations, since these are tracked in Weblate already +ignore 'MissingTranslation' +// don't error-out on external updates (new gradle plugin, library versions +// or target API become available) +// don't error-out on TypographyEllipsis, since this can be introduced with +// new translations, and those are handled in Weblate +informational 'AndroidGradlePluginVersion', 'GradleDependency', 'NewerVersionAvailable', 'OldTargetApi', 'TypographyEllipsis' // don't fail on pre-existing issues // These should be dealt with at some point, though. // To update lint-baseline.xml, just remove the file and run the build again.
core.git: android/source
android/source/res/values-ca/strings.xml |2 ++ android/source/res/values-pa/strings.xml |2 ++ 2 files changed, 4 insertions(+) New commits: commit 50d55703bd55ff807cce286f112875f322cfa098 Author: Weblate AuthorDate: Thu Dec 14 22:55:52 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 15 07:59:26 2023 +0100 android-viewer translated using Weblate Catalan currently translated at 57.5% (76 of 132 strings) Change-Id: I477bd8cf847c12e62d00385460caf91f310fa531 Added translation for android-viewer using Weblate (Punjabi) Change-Id: Idad2440113f7f4cbdc0077ac101eb14b9f449f76 Co-authored-by: A S Alam Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Weblate Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ca/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160789 Tested-by: Michael Weghorn Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-ca/strings.xml b/android/source/res/values-ca/strings.xml index 364bda9c2e3d..445b9416b54f 100644 --- a/android/source/res/values-ca/strings.xml +++ b/android/source/res/values-ca/strings.xml @@ -74,4 +74,6 @@ Cancel·la Introduïu un nom per a la part El BMP no és vàlid. +Suprimeix el full +Color de realçament \ No newline at end of file diff --git a/android/source/res/values-pa/strings.xml b/android/source/res/values-pa/strings.xml new file mode 100644 index ..a6b3daec9354 --- /dev/null +++ b/android/source/res/values-pa/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file
core.git: android/source
android/source/res/values-ca/strings.xml | 10 ++ android/source/res/values-de/strings.xml | 23 +++ android/source/res/values-kk/strings.xml |2 ++ android/source/res/values-tr/strings.xml | 22 -- 4 files changed, 19 insertions(+), 38 deletions(-) New commits: commit a056dee76e1d21526639baa9816a355327e1ce31 Author: Weblate AuthorDate: Thu Dec 14 15:22:01 2023 +0100 Commit: Christian Lohmaier CommitDate: Thu Dec 14 15:53:11 2023 +0100 android-viewer translated using Weblate Turkish currently translated at 93.9% (124 of 132 strings) Change-Id: I67905c448a119c99417a465ff90968dbf842c4d5 android-viewer translated using Weblate German currently translated at 97.7% (129 of 132 strings) Change-Id: I5b64bae8809d6a0c1366191c00b086ea003dd95a Added translation for android-viewer using Weblate (Kazakh) Change-Id: I3f0a39884167fce6e7bcfde22ee582cdc53115cb android-viewer translated using Weblate Turkish currently translated at 93.1% (123 of 132 strings) Change-Id: I4d5a8084d56fa5c3f803b26ccc31d905d477d504 android-viewer translated using Weblate Catalan currently translated at 56.0% (74 of 132 strings) Change-Id: I5296250e71d015b65f5704cc2ae088f157a5c888 android-viewer translated using Weblate Catalan currently translated at 49.2% (65 of 132 strings) Change-Id: Icfb62bf6f5d1e26efea090726f2379d72238fd6e Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Baurzhan Muftakhidinov Co-authored-by: Christian Lohmaier Co-authored-by: Michael Weghorn Co-authored-by: Weblate Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ca/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/de/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/tr/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160770 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/android/source/res/values-ca/strings.xml b/android/source/res/values-ca/strings.xml index bef151c9490b..364bda9c2e3d 100644 --- a/android/source/res/values-ca/strings.xml +++ b/android/source/res/values-ca/strings.xml @@ -64,4 +64,14 @@ Negreta Subratllat Cursiva +Política de privadesa +Crea un fitxer nou +Cancel·la +Cancel·la +Mida més petita +Tria una foto +Trieu una imatge +Cancel·la +Introduïu un nom per a la part +El BMP no és vàlid. \ No newline at end of file diff --git a/android/source/res/values-de/strings.xml b/android/source/res/values-de/strings.xml index e2a705f4fe30..7925e610b2cd 100644 --- a/android/source/res/values-de/strings.xml +++ b/android/source/res/values-de/strings.xml @@ -1,28 +1,22 @@ - LibreOffice Viewer LibreOffice-Viewer-Einstellungen - LibreOffice Viewer \'Beta\' -Version: %1$sbrBuild ID: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +Version: %1$sbrBuild ID: a href="https://hub.libreoffice.org/git-core/%2$s"%2$s/a; LibreOffice Viewer ist ein Dokumentenbetrachter, der auf LibreOffice basiert. https://www.libreoffice.org Dieses Release wurde bereitgestellt durch $VENDOR. Diese Datei ist schreibgeschützt. - Lizenz anzeigen Hinweise anzeigen Datenschutzerklärung - Neues Textdokument Neue Präsentation Neues Tabellendokument Neue Zeichnung unbenannt - Datei zum Öffnen auswählen - LibreOffice Browser Suchen Suchbegriff nicht gefunden @@ -35,11 +29,9 @@ Den experimentellen Editier-Modus aktivieren. Verwendung auf eigene Gefahr. Entwickler-Modus Entwickler-Modus, in dem in der App UNO-Kommandos gesendet werden können. Verwendung auf eigene Gefahr. - Info Abschnitte Einstellungen - Fett Unterstrichen @@ -47,34 +39,29 @@ Durchgestrichen Tastatur anzeigen Speichern -Speichern unter... +Speichern unter… Format anwenden Suchen UNO-Kommando senden - Speichern beendet Dokument wird gespeichert… Speichern unvollständig. Gab es Änderungen? Speichern des Dokuments ist fehlgeschlagen. - Passwort Rückgängig Wiederherstellen - Dokument vor dem Schließen speichern? SPEICHERN Abbrechen NEIN - Präsentation Folie hinzufügen Ihr Android-Gerät unterstützt keine In-App-SVG-Präsentation. Wir haben den Link zur Präsentation in die Zwischenablage kopiert. Drücken Sie den Home-Button, öffnen Sie einen modernen Web-Browser, fügen Sie in die Adressleiste ein und los. OK Zurück - Einfügen Löschen @@ -90,12 +77,10 @@ Geben
core.git: android/source
android/source/build.gradle |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 806ee5b22413ae3cc5d65687adf0a879c8e24ded Author: Michael Weghorn AuthorDate: Thu Dec 14 13:48:57 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Dec 14 13:54:56 2023 +0100 android lint: Dont' fail on TypographyEllipsis warning After new translations got added in commit 40f850279d912786f7943d97ec6db73ee2bb874f Author: Weblate Date: Wed Dec 13 15:33:50 2023 +0100 android-viewer translated using Weblate (Welsh) , the android build started failing like this: > Task :lintReportStrippedUIEditingDebug Wrote HTML report to file:///home/michi/development/git/libreoffice-WORKTREE-android/android/source/build/reports/lint-results-strippedUIEditingDebug.html > Task :lintStrippedUIEditingDebug FAILED Lint found 3 errors, 0 warnings (232 errors, 3 warnings filtered by baseline lint-baseline.xml). First failure: /home/michi/development/git/libreoffice-WORKTREE-android/android/source/res/values-hy/strings.xml:36: Error: Replace "..." with ellipsis character (…, ) ? [TypographyEllipsis] Պահել որպես... ~~ The full lint text report is located at: /home/michi/development/git/libreoffice-WORKTREE-android/android/source/build/intermediates/lint_intermediate_text_report/strippedUIEditingDebug/lint-results-strippedUIEditingDebug.txt FAILURE: Build failed with an exception. Downgrade that type of lint check to severity informational to not cause the build to fail. (Changes to address these will need to be done in Weblate, which is now the source of truth for translations.) Change-Id: Ibc82f96d29c8ac76f98db0259e1ee3cae4a986f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160772 Tested-by: Michael Weghorn Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 0160aa8ffe87..ce7bba57633b 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -90,9 +90,9 @@ android { } lint { warningsAsErrors true -// don't error-out on missing translations or external updates (new gradle plugin, -// library versions or target API become available) -informational 'AndroidGradlePluginVersion', 'GradleDependency', 'MissingTranslation', 'NewerVersionAvailable', 'OldTargetApi' +// don't error-out on missing translations or external updates (new translations, +// new gradle plugin, library versions or target API become available) +informational 'AndroidGradlePluginVersion', 'GradleDependency', 'MissingTranslation', 'NewerVersionAvailable', 'OldTargetApi', 'TypographyEllipsis' // don't fail on pre-existing issues // These should be dealt with at some point, though. // To update lint-baseline.xml, just remove the file and run the build again.
core.git: android/source
android/source/res/values-ca/strings.xml | 67 +++ android/source/res/values-cy/strings.xml | 135 +++ android/source/res/values-es/strings.xml | 135 +++ android/source/res/values-gl/strings.xml | 135 +++ android/source/res/values-hy/strings.xml | 135 +++ 5 files changed, 607 insertions(+) New commits: commit 40f850279d912786f7943d97ec6db73ee2bb874f Author: Weblate AuthorDate: Wed Dec 13 15:33:50 2023 +0100 Commit: Christian Lohmaier CommitDate: Thu Dec 14 13:04:38 2023 +0100 android-viewer translated using Weblate (Welsh) Currently translated at 100.0% (132 of 132 strings) Change-Id: I84d27bd881bb9d9a28d4770aaff50cae81c217a2 android-viewer translated using Weblate (Catalan) Currently translated at 48.4% (64 of 132 strings) Change-Id: Iba9603def2e2ebd3beb993e7188f226a4b3fa260 Added translation for android-viewer using Weblate (Welsh) Change-Id: I2852724a5f0267a7108aca3b4fb887d15c8421bb android-viewer translated using Weblate (Catalan) Currently translated at 46.2% (61 of 132 strings) Change-Id: I148ee4d2ad33aa43dce5ce44ff5eff18df7239b9 Added translation for android-viewer using Weblate (Catalan) Change-Id: I808e3a956f5758959cf9e708e6a3047f779cc024 android-viewer translated using Weblate (Spanish) Currently translated at 100.0% (132 of 132 strings) Change-Id: Id83ee9b9d69499604e7bf3ac15a52e5e4264192e android-viewer translated using Weblate (Spanish) Currently translated at 98.4% (130 of 132 strings) Change-Id: I17e6b0385edb32a6da1871893c646488ec35419f Added translation for android-viewer using Weblate (Spanish) Change-Id: I572a602e665f896905d378294d5485b262b4b934 android-viewer translated using Weblate (Galician) Currently translated at 100.0% (132 of 132 strings) Change-Id: Ic3026fb57a2042e45506d7507223c0b007271fe6 Added translation for android-viewer using Weblate (Galician) Change-Id: I7af380682508b4a12c902c58002884750f4dc5d3 android-viewer translated using Weblate (Armenian) Currently translated at 100.0% (132 of 132 strings) Change-Id: Ia57e0477acc8f14ee597b0b6961e2a3067064a89 Added translation using Weblate (Armenian) Change-Id: Id0c85ec1236b4a9c8a0f95c0d9510db4639e777a Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Rhoslyn Prys Co-authored-by: Tigran Zargaryan Co-authored-by: Weblate Co-authored-by: Xosé Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ca/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cy/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/es/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/gl/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/hy/ Translation: android-viewer/android-strings Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160614 Tested-by: Christian Lohmaier Reviewed-by: Christian Lohmaier diff --git a/android/source/res/values-ca/strings.xml b/android/source/res/values-ca/strings.xml new file mode 100644 index ..bef151c9490b --- /dev/null +++ b/android/source/res/values-ca/strings.xml @@ -0,0 +1,67 @@ + + +Visualitzador del LibreOffice +https://ca.libreoffice.org +Ratllat +Mostra el teclat +Desa +Introduïu la contrasenya +Fes una foto +Copia +Enganxa +Retalla +Enrere +Insereix +Estil +Pàgina +Full +Diapositiva +Part +Automàtic +Color de la lletra +Paràmetres del visualitzador del LibreOffice +«Beta» del visualitzador del LibreOffice +Aquesta aplicació és un visualitzador de documents basat en el LibreOffice. +Aquest fitxer és només de lectura. +Mostra la llicència +Document de text nou +Presentació nova +Full de càlcul nou +Dibuix nou +sense títol +Cerca +Preferències +Fitxers recents +Tots els fitxers +Mode experimental +Mode de desenvolupament +Quant a +Parts +Paràmetres +Anomena i desa… +Cerca +Contrasenya +Desfés +Refés +Voleu desar el document abans de tancar-lo\? +DESA +NO +Presentació de diapositives +Afegeix una diapositiva +Enrere +Insereix +Suprimeix +Amaga +Mostra +Insereix una taula +Suprimeix la diapositiva +Tipus +Valor +Exporta com a PDF +Imprimeix +Caràcter +Paràgraf +Negreta +Subratllat +Cursiva + \ No newline at end of file diff --git
core.git: android/source
android/source/Makefile |5 android/source/build.gradle | 10 android/source/lint-baseline.xml | 2649 +++ 3 files changed, 2660 insertions(+), 4 deletions(-) New commits: commit 6b788f8baf4c6ba42dc6c0f580fbf9480d8c60d3 Author: Michael Weghorn AuthorDate: Fri Dec 8 14:57:14 2023 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 13 10:50:26 2023 +0100 android: Make the build fail on new lint warnings In order to avoid introducing new lint errors, also run the `lint` gradle target when building Android Viewer and set the `warningsAsErrors true` lint option. This makes the build fail on (new) lint errors. See [1] for more details. Downgrade missing translations and issues that can "suddenly" appear without any code changes to the app itself to informational, to prevent (CI) builds from suddenly starting to fail just because a new Android Gradle Plugin version or external library becomes available etc. To be able to avoid introducing new issues without having to address all existing ones right now, use a baseline file ("lint-baseline.xml") as described at [2] which lists all existing issues, so they don't result in a failing build. Those should still be looked into at some point. Updating the baseline file can be done by just removing the existing one and running the build again. (Build will create the new baseline file and fail on first run after deleting the file, then find the new file and succeed in subsequent builds.) [1] https://developer.android.com/studio/write/lint [2] https://developer.android.com/studio/write/lint#customize-the-baseline Change-Id: Iddbe432519ab3040c83c0e977a584b51d3ef1e5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160199 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/Makefile b/android/source/Makefile index 32b233c74a4c..2c1d6f9f1cca 100644 --- a/android/source/Makefile +++ b/android/source/Makefile @@ -3,11 +3,12 @@ gb_Side:=host include ../../config_host.mk endif -# The default target just builds. +# The default target builds the APK and runs lint. all: build-gradle DISABLE_UI=TRUE +BUILD_VARIANT=$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug) BOOTSTRAPDIR=../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared @@ -29,7 +30,7 @@ clean: build-gradle: liboSettings.gradle local.properties link-so ifeq ($(ENABLE_JAVA),TRUE) - if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug) ; fi + if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(BUILD_VARIANT) lint$(BUILD_VARIANT) ; fi endif run: diff --git a/android/source/build.gradle b/android/source/build.gradle index eed27bef4e54..0160aa8ffe87 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -89,8 +89,14 @@ android { fullUI.dimension "default" } lint { -// don't error-out on missing translations -warning 'MissingTranslation' +warningsAsErrors true +// don't error-out on missing translations or external updates (new gradle plugin, +// library versions or target API become available) +informational 'AndroidGradlePluginVersion', 'GradleDependency', 'MissingTranslation', 'NewerVersionAvailable', 'OldTargetApi' +// don't fail on pre-existing issues +// These should be dealt with at some point, though. +// To update lint-baseline.xml, just remove the file and run the build again. +baseline file("lint-baseline.xml") } } diff --git a/android/source/lint-baseline.xml b/android/source/lint-baseline.xml new file mode 100644 index ..b4c05e26dc6b --- /dev/null +++ b/android/source/lint-baseline.xml @@ -0,0 +1,2649 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +https://g.co/dev/packagevisibility for details" +errorLine1="if (takePictureIntent.resolveActivity(mContext.getPackageManager()) != null) {" +errorLine2=" ~~~"> + + + +https://g.co/dev/packagevisibility for details" +errorLine1=" .queryIntentActivities(takePictureIntent, PackageManager.MATCH_DEFAULT_ONLY);" +errorLine2="
core.git: android/source Makefile.in
Makefile.in |1 + android/source/Makefile |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 8d268ed276a421e6c3c697093b69dd5aaf181d63 Author: Michael Weghorn AuthorDate: Tue Dec 12 12:02:04 2023 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 13 01:16:59 2023 +0100 android: Remove generated resources in "clean" make targets Since these are produced by the build, they should also be removed in the "clean" target. Without this, Jenkins CI builds for the upcoming Change-Id: Iddbe432519ab3040c83c0e977a584b51d3ef1e5b Author: Michael Weghorn Date: Fri Dec 8 14:57:14 2023 +0100 android: Make the build fail on new lint warnings were seen failing, despite the example file no longer being part of the generated resources since commit 1d7b1e2d4099aac15e695696e6a0640d6e01e23f Author: Michael Weghorn Date: Wed Nov 15 13:16:26 2023 +0100 android: Drop "More Info" item in "About" dialog , but apparently the file was still lingering around from previous builds. Build failure/Lint error from CI build [1]: > Task :lintReportStrippedUIEditingDebug Wrote HTML report to file:///home/tdf/lode/jenkins/workspace/android_arm/android/source/build/reports/lint-results-strippedUIEditingDebug.html > Task :lintStrippedUIEditingDebug FAILED /home/tdf/lode/jenkins/workspace/android_arm/android/source/lint-baseline.xml: Information: 237 errors and 11 warnings were filtered out because they are listed in the baseline file, lint-baseline.xml [LintBaseline] /home/tdf/lode/jenkins/workspace/android_arm/android/source/res_generated/raw/example.odt: Error: The resource R.raw.example appears to be unused [UnusedResources] Explanation for issues of type "UnusedResources": Unused resources make applications larger and slow down builds. The unused resource check can ignore tests. If you want to include resources that are only referenced from tests, consider packaging them in a test source set instead. You can include test sources in the unused resource check by setting the system property lint.unused-resources.include-tests =true, and to exclude them (usually for performance reasons), use lint.unused-resources.exclude-tests =true. , 1 errors, 0 warnings (237 errors, 11 warnings filtered by baseline lint-baseline.xml) FAILURE: Build failed with an exception. This could also be reproduced locally: After a $ touch android/source/res_generated/example.odt , the above error would on build, and neither `make clean` nor `make android.clean` would remove the file and thus fix the problem for subsequent builds. Add removing the directory to the top-level and Android-specific clean targets, so either of these commands now takes care of this. [1] https://ci.libreoffice.org/job/gerrit_android_arm/33845/console Change-Id: I91c83ce4ddb236d87d7c51f4dcce85e99aae0107 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160612 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/Makefile.in b/Makefile.in index 0da4ba05bda2..83a37ecb90e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -192,6 +192,7 @@ ifeq ($(OS),ANDROID) rm -fr $(SRCDIR)/android/source/assets rm -fr $(SRCDIR)/android/source/assets_fullUI rm -fr $(SRCDIR)/android/source/assets_strippedUI + rm -fr $(SRCDIR)/android/source/res_generated endif endif diff --git a/android/source/Makefile b/android/source/Makefile index d934994001d9..32b233c74a4c 100644 --- a/android/source/Makefile +++ b/android/source/Makefile @@ -23,7 +23,7 @@ uninstall: $(ANDROID_SDK_DIR)/platform-tools/adb uninstall $(ANDROID_PACKAGE_NAME) clean: - rm -rf assets assets_fullUI assets_strippedUI build jniLibs jniLibs_debug $(OBJLOCAL) + rm -rf assets assets_fullUI assets_strippedUI build jniLibs jniLibs_debug res_generated $(OBJLOCAL) rm -f native-code.cxx rm -f liboSettings.gradle
core.git: android/source
dev/null |binary 1 file changed New commits: commit 946a7fd8063219b3621fbdc22c28a57ee72a2067 Author: Michael Weghorn AuthorDate: Fri Dec 8 16:12:09 2023 +0100 Commit: Michael Weghorn CommitDate: Tue Dec 12 06:18:22 2023 +0100 android lint: Drop unused image resources Drop unused image resources that lint warns about, e.g.: Change-Id: I69422d485fc324245fd562fd75b016862b29c2a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160490 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/drawable-hdpi/action_search.png b/android/source/res/drawable-hdpi/action_search.png deleted file mode 100644 index e6b70451863a.. Binary files a/android/source/res/drawable-hdpi/action_search.png and /dev/null differ diff --git a/android/source/res/drawable-hdpi/action_search_light.png b/android/source/res/drawable-hdpi/action_search_light.png deleted file mode 100644 index f12e005ebe83.. Binary files a/android/source/res/drawable-hdpi/action_search_light.png and /dev/null differ
core.git: android/source
android/source/res/layout/toolbar_bottom.xml |1 - 1 file changed, 1 deletion(-) New commits: commit 43689c37648adb934ca902c6ae4acb4f8ec831ef Author: Michael Weghorn AuthorDate: Fri Dec 8 16:34:51 2023 +0100 Commit: Michael Weghorn CommitDate: Tue Dec 12 06:17:57 2023 +0100 android lint: Drop extra closing XML tag This was accidently added in commit a21e7a76d745750dcea14bc6311e4f1766c3fa45 Author: Michael Weghorn Date: Thu Nov 9 10:24:13 2023 +0100 android a11y: Add content labels and now reported by lint: Change-Id: If4a17c4cd10450c2f5e13ead88a7511684ab9956 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160469 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index 7efb5c0fc7fe..172b215f5a1c 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -478,7 +478,6 @@ android:padding="10dp" android:src="@drawable/ic_search_direction_up" android:contentDescription="@string/search_find_previous" /> -/>
core.git: android/source
android/source/build.gradle |3 +++ android/source/gradle.properties |1 - 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 638d25d141fdaf2ec54dfcc7d9d42207150761a3 Author: Thorsten Behrens AuthorDate: Mon Dec 11 00:46:43 2023 +0100 Commit: Thorsten Behrens CommitDate: Mon Dec 11 21:36:55 2023 +0100 Move Android buildfeature config to build.gradle Old gradle.properties entry was deprecated in 8.0: - https://cs.android.com/android-studio/platform/tools/base/+/0bc1c23297760643b03e8cfd8acc52c007a99cd6 Change-Id: Ia34379e8112cc2c316be229e7719c2ce1b695576 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160602 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/android/source/build.gradle b/android/source/build.gradle index 8843330b7ba5..eed27bef4e54 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -40,6 +40,9 @@ dependencies { android { namespace 'org.libreoffice' compileSdk 34 +buildFeatures { +buildConfig = true +} // uses non-conventional source layout, so need to reconfigure accordingly // ToDo move to conventional layout, so stuff can be stripped down. sourceSets { diff --git a/android/source/gradle.properties b/android/source/gradle.properties index 76578d6146a5..19f2d673e497 100644 --- a/android/source/gradle.properties +++ b/android/source/gradle.properties @@ -1,4 +1,3 @@ -android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false android.nonTransitiveRClass=false android.useAndroidX=true
core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 4bba7fbc22f13d579e57b36e8c8e302d987e01f0 Author: Michael Weghorn AuthorDate: Fri Dec 8 16:34:19 2023 +0100 Commit: Christian Lohmaier CommitDate: Mon Dec 11 19:04:49 2023 +0100 android lint: Add API level check for EXTRA_INITIAL_URI `DocumentsContract.EXTRA_INITIAL_URI` was added in API level 26, so only set it conditionally when that API level is avaible. Change-Id: I6783e89f50354c017968b74cc45fb1a3b6faab83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160468 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index 23bf8d27b6c3..cf60ff37c5da 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -324,7 +324,9 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin intent.addCategory(Intent.CATEGORY_OPENABLE); String mimeType = getODFMimeTypeForDocument(); intent.setType(mimeType); -intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, mDocumentUri); +if (Build.VERSION.SDK_INT >= 26) { +intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, mDocumentUri); +} startActivityForResult(intent, REQUEST_CODE_SAVEAS); } @@ -351,7 +353,9 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin intent.addCategory(Intent.CATEGORY_OPENABLE); intent.setType(FileUtilities.MIMETYPE_PDF); // suggest directory and file name based on the doc -intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, mDocumentUri); +if (Build.VERSION.SDK_INT >= 26) { +intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, mDocumentUri); +} final String displayName = toolbarTop.getTitle().toString(); final String suggestedFileName = FileUtilities.stripExtensionFromFileName(displayName) + ".pdf"; intent.putExtra(Intent.EXTRA_TITLE, suggestedFileName);
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- android/source/gradle/wrapper/gradle-wrapper.properties |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 08ba31da63b58e92de05e96563146d3e909352e9 Author: Michael Weghorn AuthorDate: Fri Dec 1 12:45:37 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 1 20:34:02 2023 +0100 android: Update Android Gradle Plugin to 8.2.0 ... and gradle to 8.2, as suggested by Android Studio. Change-Id: I1a1df5f43b7a95d24308873b708d3d21b76aa7f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160200 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 3157dcf6ad6d..8843330b7ba5 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -21,7 +21,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:8.1.4' +classpath 'com.android.tools.build:gradle:8.2.0' } } diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index b22661d9bfd2..ec719b3ea19d 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip +distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists
[Libreoffice-commits] core.git: android/source
android/source/res/values/colors.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05f80d673a27bba2520fac07888db5082dd7f9bd Author: Andrea Gelmini AuthorDate: Fri Dec 1 12:10:29 2023 +0100 Commit: Julien Nabet CommitDate: Fri Dec 1 17:03:37 2023 +0100 Fix typo Change-Id: Ia40016ad2696c8555163074c415ea0e8f9216f3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160207 Reviewed-by: Michael Weghorn Tested-by: Jenkins diff --git a/android/source/res/values/colors.xml b/android/source/res/values/colors.xml index 8f97b3e67130..4642a2b8f1c1 100644 --- a/android/source/res/values/colors.xml +++ b/android/source/res/values/colors.xml @@ -6,7 +6,7 @@ + but current minimum API level is lower. Overridden for dark theme in values-night/color.xml. --> @color/background_floating_material_light #FAFAFA
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |5 + 1 file changed, 5 insertions(+) New commits: commit 55097433ed766a2ced6b87021a71c8a31cde9d99 Author: Michael Weghorn AuthorDate: Fri Dec 1 10:17:02 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 1 11:54:42 2023 +0100 android: Shown warnings about deprecated API usage Configure the gradle build to show detailed warnings about the use of deprecated API, instead of just > Task :compileStrippedUIEditingDebugJavaWithJavac Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. With this in place, 78 specific warnings about the use of deprecated API are now shown in the build output, which can be addressed at some point. Change-Id: I9f3b484b6dfad1fc57895efa7d3426b625030ee7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160198 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 8fd3de9be2c3..3157dcf6ad6d 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -91,6 +91,11 @@ android { } } +// show warnings about use of deprecated API +tasks.withType(JavaCompile).configureEach { +options.deprecation = true +} + /* remark inherited from makefile: Then "assets". Let the directory structure under assets mimic that under solver for now.
[Libreoffice-commits] core.git: android/source
android/source/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 266a0e72e8382f0b72fa7b1127ce8712103aa562 Author: Michael Weghorn AuthorDate: Thu Nov 30 11:44:01 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 30 14:18:22 2023 +0100 android: Remove 'build' dir in 'clean' make target Add the build dir (`android/source/build`) to the directories to be removed when cleaning. Previously, this was't cleaned, which could be seen e.g. by the fact that a fresh build would result in this warning being shown > Task :compileStrippedUIEditingDebugJavaWithJavac Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. while a make android.clean make android after a full build wouldn't. Change-Id: I00a4f8b1fda9fbefb3b8f806b1997eceded117fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160145 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/Makefile b/android/source/Makefile index 1dc1b42d187b..d934994001d9 100644 --- a/android/source/Makefile +++ b/android/source/Makefile @@ -23,7 +23,7 @@ uninstall: $(ANDROID_SDK_DIR)/platform-tools/adb uninstall $(ANDROID_PACKAGE_NAME) clean: - rm -rf assets assets_fullUI assets_strippedUI jniLibs jniLibs_debug $(OBJLOCAL) + rm -rf assets assets_fullUI assets_strippedUI build jniLibs jniLibs_debug $(OBJLOCAL) rm -f native-code.cxx rm -f liboSettings.gradle
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 68ccc26f64632e0af66ff18d164aa39468ad3a2d Author: Michael Weghorn AuthorDate: Wed Nov 29 14:03:28 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 30 12:18:01 2023 +0100 android: Update com.google.android.material:material to 1.10.0 Depends on the previous commit Change-Id: I2778d8c181daa92530c769a168a9e186b6ea079c Author: Michael Weghorn Date: Wed Nov 29 13:33:33 2023 +0100 android: Update compileSdk/targetSdkVersion to 34 Change-Id: Ibdb7e002d599d42256290febc422cf86b2694d46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160087 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index ea93633489c7..8fd3de9be2c3 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -32,7 +32,7 @@ dependencies { "libreoffice.jar", "unoloader.jar" ]) -implementation 'com.google.android.material:material:1.9.0' +implementation 'com.google.android.material:material:1.10.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.multidex:multidex:2.0.1" }
[Libreoffice-commits] core.git: android/source
android/source/res/layout/activity_document_browser.xml |2 +- android/source/res/layout/toolbar_bottom.xml| 12 ++-- android/source/res/layout/toolbar_color_picker.xml |2 +- android/source/res/menu/main.xml|8 4 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 59093ecb1cdf0ba8c946dfdbe0ec7ee0e89cd6f6 Author: Michael Weghorn AuthorDate: Tue Nov 28 14:54:49 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 30 12:16:51 2023 +0100 tdf#124480 android: Rename icons no longer using hard-coded color As already mentioned in Change-Id I2061878067d21dcd743ad6ca8d1018db323755d6 Author: Michael Weghorn Date: Tue Nov 28 14:22:54 2023 +0100 tdf#124480 android: Use themed color for more icons , do this: > Given the icons are no longer hard-coded to be black, > the files with a "_black" suffix will be renamed in > a follow-up commit. (Separate commit to keep the > diff clearer.) Change-Id: Ie2d3433934569dc97530a35d88bda01802af96b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160074 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/drawable/ic_add_black_24dp.xml b/android/source/res/drawable/ic_add_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_add_black_24dp.xml rename to android/source/res/drawable/ic_add_24dp.xml diff --git a/android/source/res/drawable/ic_arrow_back_black_24dp.xml b/android/source/res/drawable/ic_arrow_back_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_arrow_back_black_24dp.xml rename to android/source/res/drawable/ic_arrow_back_24dp.xml diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml b/android/source/res/drawable/ic_content_copy_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_content_copy_black_24dp.xml rename to android/source/res/drawable/ic_content_copy_24dp.xml diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml b/android/source/res/drawable/ic_content_cut_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_content_cut_black_24dp.xml rename to android/source/res/drawable/ic_content_cut_24dp.xml diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml b/android/source/res/drawable/ic_content_paste_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_content_paste_black_24dp.xml rename to android/source/res/drawable/ic_content_paste_24dp.xml diff --git a/android/source/res/drawable/ic_filter_list_black_24dp.xml b/android/source/res/drawable/ic_filter_list_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_filter_list_black_24dp.xml rename to android/source/res/drawable/ic_filter_list_24dp.xml diff --git a/android/source/res/drawable/ic_folder_black_24dp.xml b/android/source/res/drawable/ic_folder_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_folder_black_24dp.xml rename to android/source/res/drawable/ic_folder_24dp.xml diff --git a/android/source/res/drawable/ic_format_clear_black_24dp.xml b/android/source/res/drawable/ic_format_clear_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_format_clear_black_24dp.xml rename to android/source/res/drawable/ic_format_clear_24dp.xml diff --git a/android/source/res/drawable/ic_grid_off_black_24dp.xml b/android/source/res/drawable/ic_grid_off_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_grid_off_black_24dp.xml rename to android/source/res/drawable/ic_grid_off_24dp.xml diff --git a/android/source/res/drawable/ic_grid_on_black_24dp.xml b/android/source/res/drawable/ic_grid_on_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_grid_on_black_24dp.xml rename to android/source/res/drawable/ic_grid_on_24dp.xml diff --git a/android/source/res/drawable/ic_settings_black_24dp.xml b/android/source/res/drawable/ic_settings_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_settings_black_24dp.xml rename to android/source/res/drawable/ic_settings_24dp.xml diff --git a/android/source/res/drawable/ic_sort_black_24dp.xml b/android/source/res/drawable/ic_sort_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_sort_black_24dp.xml rename to android/source/res/drawable/ic_sort_24dp.xml diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index b8c00cf973d0..5f03d4bc0c28 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -123,7 +123,7 @@ app:fabSize="normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" -
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/canvas/CalcHeaderCell.java | 21 ++ 1 file changed, 14 insertions(+), 7 deletions(-) New commits: commit d134615570bd7afb045f983cdd008c5662265504 Author: Michael Weghorn AuthorDate: Mon Nov 27 11:05:57 2023 +0100 Commit: Michael Weghorn CommitDate: Mon Nov 27 14:04:21 2023 +0100 tdf#158398 android: Draw light gray background for Calc headers Similar to the desktop version, use a light gray background color for the Calc header cells. There was already code in place to draw darker gray background to highlight the header cell when a cell in that row/column is selected. (The actually highlighted header cell didn't wasn't always the correct one in a quick test, but that's independent of this change.) Adapt that to always fill the rectangle, but use a lighter gray (lower alpha value) when not selected. Use a separate `Paint` object for the frame (stroke). Set the frame color and text color to black instead of gray, for better contrast to the light gray fill/background. Change-Id: I0490811e928ebd1b3840242fc1aa4682b2786b00 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159989 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/canvas/CalcHeaderCell.java b/android/source/src/java/org/libreoffice/canvas/CalcHeaderCell.java index eec0b5e4a88d..a285234bc8b0 100644 --- a/android/source/src/java/org/libreoffice/canvas/CalcHeaderCell.java +++ b/android/source/src/java/org/libreoffice/canvas/CalcHeaderCell.java @@ -10,6 +10,8 @@ import android.text.TextPaint; public class CalcHeaderCell extends CommonCanvasElement { private final TextPaint mTextPaint = new TextPaint(); + +private final Paint mFramePaint = new Paint(); private final Paint mBgPaint = new Paint(); private final RectF mBounds; private final Rect mTextBounds = new Rect(); @@ -17,16 +19,20 @@ public class CalcHeaderCell extends CommonCanvasElement { public CalcHeaderCell(float left, float top, float width, float height, String text, boolean selected) { mBounds = new RectF(left, top, left + width, top + height); + +mFramePaint.setStyle(Style.STROKE); +mFramePaint.setColor(Color.BLACK); + +mBgPaint.setStyle(Style.FILL); +mBgPaint.setColor(Color.GRAY); +// draw background more intensely when cell is selected if (selected) { -// if the cell is selected, display filled -mBgPaint.setStyle(Style.FILL_AND_STROKE); +mBgPaint.setAlpha(100); } else { -// if not, display only the frame -mBgPaint.setStyle(Style.STROKE); +mBgPaint.setAlpha(25); } -mBgPaint.setColor(Color.GRAY); -mBgPaint.setAlpha(100); // hard coded for now -mTextPaint.setColor(Color.GRAY); + +mTextPaint.setColor(Color.BLACK); mTextPaint.setTextSize(24f); // hard coded for now mTextPaint.setTextAlign(Paint.Align.CENTER); mText = text; @@ -54,6 +60,7 @@ public class CalcHeaderCell extends CommonCanvasElement { @Override public void onDraw(Canvas canvas) { canvas.drawRect(mBounds, mBgPaint); +canvas.drawRect(mBounds, mFramePaint); canvas.drawText(mText, mBounds.centerX(), mBounds.centerY() - mTextBounds.centerY(), mTextPaint); } }
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |4 android/source/src/java/org/libreoffice/ui/FileUtilities.java|5 + 2 files changed, 9 insertions(+) New commits: commit 872d26d4a859ff72e1e13068b798854185960de0 Author: Michael Weghorn AuthorDate: Sat Nov 25 22:09:34 2023 +0100 Commit: Michael Weghorn CommitDate: Sun Nov 26 18:07:37 2023 +0100 android: Suggest file name for PDF export When using the PDF export feature in Android Viewer, suggest a file name for the PDF file that matches the current display name (which is usually the file name, or "untitled" for a newly created doc that hasn't been saved yet). This can be achieved by setting `Intent.EXTRA_TITLE` for the `ACTION_CREATE_DOCUMENT`. [1] The `DocumentsContract.EXTRA_INITIAL_URI` already set previously already results in the same directory as the doc being preselected in the file chooser: > Callers can set a document URI through > DocumentsContract#EXTRA_INITIAL_URI to indicate the initial location of > documents navigator. System will do its best to launch the navigator in > the specified document if it's a folder, or the folder that contains the > specified document if not. Filling in the current file name was suggested in a Google Play review comment for the app. [1] https://developer.android.com/reference/android/content/Intent#ACTION_CREATE_DOCUMENT Change-Id: Idbd4a89416089f927e0232ce65161b43059ca46d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159959 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index b21ad02383d7..ba371bfd9c8a 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -350,7 +350,11 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT); intent.addCategory(Intent.CATEGORY_OPENABLE); intent.setType(FileUtilities.MIMETYPE_PDF); +// suggest directory and file name based on the doc intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, mDocumentUri); +final String displayName = toolbarTop.getTitle().toString(); +final String suggestedFileName = FileUtilities.stripExtensionFromFileName(displayName) + ".pdf"; +intent.putExtra(Intent.EXTRA_TITLE, suggestedFileName); startActivityForResult(intent, REQUEST_CODE_EXPORT_TO_PDF); } diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index 902b30ed7794..7fc8c3c84eb1 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java @@ -124,6 +124,11 @@ public class FileUtilities { return mimeType != null && mimeType.endsWith("template"); } +public static String stripExtensionFromFileName(final String fileName) +{ +return fileName.split("\\.[A-Za-z0-9]*$")[0]; +} + /** * Tries to retrieve the display (which should be the document name) * for the given URI using the given resolver.
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 934a4937e32b4ccf4690b642ccf4787331f37b68 Author: Michael Weghorn AuthorDate: Thu Nov 23 11:35:03 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 23 13:20:56 2023 +0100 tdf#158331 android: Fix "Save As" for non-experimental mode While "Save" (i.e. saving back to the original location) doesn't make sense when editing is disabled (because the doc cannot be changed) and the menu entry is therefore not available when the experimental editing mode is disabled, "Save As" does make sense, e.g. in order to save a copy of a file opened from another app. The menu entry was there, but not working as expected, a 0-byte file was created. This is because `LibreOfficeMainActivity#saveFileToOriginalSource` would return early if experimental mode is disabled. No longer do that, but save the file as requested. Change-Id: I5785b6060c4ba9cdf3e9c3591b9f941ab987bf4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159857 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index 54418f5cbc8f..b21ad02383d7 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -416,7 +416,7 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin } public void saveFileToOriginalSource() { -if (isReadOnlyMode() || mTempFile == null || mDocumentUri == null || !mDocumentUri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) +if (mTempFile == null || mDocumentUri == null || !mDocumentUri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) return; boolean copyOK = false;
[Libreoffice-commits] core.git: android/source
android/source/res/drawable/calc.png|binary android/source/res/drawable/draw.png|binary android/source/res/drawable/impress.png |binary android/source/res/drawable/writer.png |binary 4 files changed New commits: commit 1750078e3ace30d3ad9798feb81239688b1ea869 Author: Michael Weghorn AuthorDate: Fri Nov 17 14:30:19 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Nov 17 16:39:05 2023 +0100 android: Update app-specific/MIME type icons Just as commit 2105f638fa178f49210116bd914889599930b62a Author: Michael Weghorn Date: Fri Nov 17 09:11:42 2023 +0100 android: Update app icon to new startcenter icon updated the main icon for the Android app, also update the MIME type icons that are shown in the "Recent files" section in LibreOfficeUIActivity to the new ones meant to be used for Calc/Draw/Impress/Writer since 7.5. Change-Id: I1d969a290caa3c23589e78151cd5bf70144c3099 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159568 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/drawable/calc.png b/android/source/res/drawable/calc.png index 0c0d31444d11..240da6c8966d 100644 Binary files a/android/source/res/drawable/calc.png and b/android/source/res/drawable/calc.png differ diff --git a/android/source/res/drawable/draw.png b/android/source/res/drawable/draw.png index b3ee11426a04..8b8436789cc2 100644 Binary files a/android/source/res/drawable/draw.png and b/android/source/res/drawable/draw.png differ diff --git a/android/source/res/drawable/impress.png b/android/source/res/drawable/impress.png index 5909f05bf089..2de82d6bd42b 100644 Binary files a/android/source/res/drawable/impress.png and b/android/source/res/drawable/impress.png differ diff --git a/android/source/res/drawable/writer.png b/android/source/res/drawable/writer.png index 8a4e21e47174..6cc9e8483033 100644 Binary files a/android/source/res/drawable/writer.png and b/android/source/res/drawable/writer.png differ
[Libreoffice-commits] core.git: android/source
android/source/ic_launcher-web.png|binary android/source/res/mipmap-hdpi/ic_launcher.png|binary android/source/res/mipmap-mdpi/ic_launcher.png|binary android/source/res/mipmap-xhdpi/ic_launcher.png |binary android/source/res/mipmap-xxhdpi/ic_launcher.png |binary android/source/res/mipmap-xxxhdpi/ic_launcher.png |binary 6 files changed New commits: commit 2105f638fa178f49210116bd914889599930b62a Author: Michael Weghorn AuthorDate: Fri Nov 17 09:11:42 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Nov 17 12:36:28 2023 +0100 android: Update app icon to new startcenter icon Update the icon used for LibreOffice Viewer with the new icon used since LibreOffice 7.5 [1]. Use the startcenter icon from `sysui/desktop/icons/hicolor/` and export for the required resolutions where it doesn't exist yet. [1] https://wiki.documentfoundation.org/ReleaseNotes/7.5#Design Change-Id: Ie9f59d42bbc9375e7ca433c6452223b7ba3033a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159554 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/ic_launcher-web.png b/android/source/ic_launcher-web.png index e9dcfcacf844..82497c1ac299 100644 Binary files a/android/source/ic_launcher-web.png and b/android/source/ic_launcher-web.png differ diff --git a/android/source/res/mipmap-hdpi/ic_launcher.png b/android/source/res/mipmap-hdpi/ic_launcher.png index f8b74553e385..0765a1e0108e 100644 Binary files a/android/source/res/mipmap-hdpi/ic_launcher.png and b/android/source/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/source/res/mipmap-mdpi/ic_launcher.png b/android/source/res/mipmap-mdpi/ic_launcher.png index fa68d30f003a..dcc03ff1fb2c 100644 Binary files a/android/source/res/mipmap-mdpi/ic_launcher.png and b/android/source/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/source/res/mipmap-xhdpi/ic_launcher.png b/android/source/res/mipmap-xhdpi/ic_launcher.png index 12069c7e8ac5..d8fb1d912633 100644 Binary files a/android/source/res/mipmap-xhdpi/ic_launcher.png and b/android/source/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/source/res/mipmap-xxhdpi/ic_launcher.png b/android/source/res/mipmap-xxhdpi/ic_launcher.png index a00a40dbe1de..7b9a8029aa40 100644 Binary files a/android/source/res/mipmap-xxhdpi/ic_launcher.png and b/android/source/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/source/res/mipmap-xxxhdpi/ic_launcher.png b/android/source/res/mipmap-xxxhdpi/ic_launcher.png index ef7067cbd2a3..86d268ede8ef 100644 Binary files a/android/source/res/mipmap-xxxhdpi/ic_launcher.png and b/android/source/res/mipmap-xxxhdpi/ic_launcher.png differ
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/AboutDialogFragment.java |2 +- android/source/src/java/org/libreoffice/ToolbarController.java|2 +- android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |2 +- dev/null |binary 4 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 129c493adc3d572e2417e62bc96d7b2cfbe0d983 Author: Michael Weghorn AuthorDate: Fri Nov 17 09:04:09 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Nov 17 12:35:38 2023 +0100 android: Reuse launcher icon in activities Instead of duplicating the icon as drawable, just use the one from the mipmap folder that's used for the app launcher. Change-Id: Idd6691c4639fb570357280cec63636d07fe06b20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159553 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/drawable-hdpi/lo_icon.png b/android/source/res/drawable-hdpi/lo_icon.png deleted file mode 100644 index d03373b9c2ee.. Binary files a/android/source/res/drawable-hdpi/lo_icon.png and /dev/null differ diff --git a/android/source/res/drawable-mdpi/lo_icon.png b/android/source/res/drawable-mdpi/lo_icon.png deleted file mode 100644 index 48e90bd1fdc5.. Binary files a/android/source/res/drawable-mdpi/lo_icon.png and /dev/null differ diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java index 4abf9c14a35f..4ed351026778 100644 --- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java +++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java @@ -70,7 +70,7 @@ public class AboutDialogFragment extends DialogFragment { } AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); -builder .setIcon(R.drawable.lo_icon) +builder .setIcon(R.mipmap.ic_launcher) .setTitle(R.string.app_name) .setView(messageView) .setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() { diff --git a/android/source/src/java/org/libreoffice/ToolbarController.java b/android/source/src/java/org/libreoffice/ToolbarController.java index 5d2f9823ad1f..603d2258167e 100644 --- a/android/source/src/java/org/libreoffice/ToolbarController.java +++ b/android/source/src/java/org/libreoffice/ToolbarController.java @@ -146,7 +146,7 @@ public class ToolbarController implements Toolbar.OnMenuItemClickListener { @Override public void run() { mMainMenu.setGroupVisible(R.id.group_edit_actions, false); -mToolbarTop.setNavigationIcon(R.drawable.lo_icon); +mToolbarTop.setNavigationIcon(R.mipmap.ic_launcher); mToolbarTop.setLogo(null); setEditModeOn(false); mContext.hideBottomToolbar(); diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 0539a920b307..eba618095045 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -175,7 +175,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { -actionBar.setIcon(R.drawable.lo_icon); +actionBar.setIcon(R.mipmap.ic_launcher); } editFAB = findViewById(R.id.editFAB);
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/mozilla/gecko/gfx/LayerView.java | 10 -- 1 file changed, 10 deletions(-) New commits: commit c5c2d3195189a329516c918faa251cff4baaed5a Author: Michael Weghorn AuthorDate: Thu Nov 9 08:26:18 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 9 14:40:43 2023 +0100 android: Drop unused LayerView#mFullScreen ... and the getters and setters. Change-Id: I14e69e2543d92dc63954bc3faf5a7456d2343fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159200 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java index 2e1a897b62e7..29049f92912d 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java @@ -45,8 +45,6 @@ public class LayerView extends FrameLayout { private InputConnectionHandler mInputConnectionHandler; private LayerRenderer mRenderer; -private boolean mFullScreen = false; - private SurfaceView mSurfaceView; private Listener mListener; @@ -336,12 +334,4 @@ public class LayerView extends FrameLayout { super(e); } } - -public void setFullScreen(boolean fullScreen) { -mFullScreen = fullScreen; -} - -public boolean isFullScreen() { -return mFullScreen; -} }
[Libreoffice-commits] core.git: android/source
android/source/res/layout/activity_document_browser.xml |1 + android/source/res/layout/toolbar_bottom.xml|7 +-- android/source/res/values/strings.xml |3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) New commits: commit a21e7a76d745750dcea14bc6311e4f1766c3fa45 Author: Michael Weghorn AuthorDate: Thu Nov 9 10:24:13 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 9 12:59:28 2023 +0100 android a11y: Add content labels Add a few content labels, so screen readers can present these UI elements in a more meaningful way. Reported by Google Play CI: > This item may not have a label readable by screen readers. > Learn more [1] [1] https://support.google.com/accessibility/android/answer/7158690 Change-Id: Ic8e8885ed132367426207fad652e324ea4eb0790 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159206 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index 23ef44f4e5dc..c4dcf3f0c8c1 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -116,6 +116,7 @@ +android:src="@drawable/ic_search_direction_down" +android:contentDescription="@string/search_find_next" /> +android:src="@drawable/ic_search_direction_up" +android:contentDescription="@string/search_find_previous" /> +/> Show Notice More Info +Create New File New Text Document New Presentation New Spreadsheet @@ -26,6 +27,8 @@ LibreOffice Browser Search Keyword not found +Find Next +Find Previous Preferences fileicon Recent files
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java |3 --- 1 file changed, 3 deletions(-) New commits: commit 560cb9c53e7c6d6b8164cdd92e897d3c99b850d2 Author: Michael Weghorn AuthorDate: Wed Nov 8 18:11:56 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 9 07:56:07 2023 +0100 android: Drop obsolete TODO comment This comment was originally for the code underneath, that has already been separated into a separate method in gecko-dev commit [1] commit 60ed20fee4095523ee498579c71fc17032d1004b Author: Patrick Walton Date: Mon Feb 13 12:27:09 2012 -0800 Split out Java compositor shader program activation and deactivation into separate functions , but the comment was left behind. [1] https://github.com/mozilla/gecko-dev/commit/60ed20fee4095523ee498579c71fc17032d1004b Change-Id: Ied0a4aaec4d8228665748b834026b54c8e9615bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159184 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java index 792cb0422eb2..6f013612384e 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java @@ -184,9 +184,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer { GLES20.glEnableVertexAttribArray(mTextureHandle); GLES20.glUniform1i(mSampleHandle, 0); - -// TODO: Move these calls into a separate deactivate() call that is called after the -// underlay and overlay are rendered. } // Deactivates the shader program. This must be done to avoid crashes after returning to the
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |1 - 1 file changed, 1 deletion(-) New commits: commit ff3fb42b48c70ba5788507a6177bf0a9f3b50fdb Author: Michael Weghorn AuthorDate: Tue Nov 7 17:27:49 2023 +0100 Commit: Michael Weghorn CommitDate: Tue Nov 7 22:17:35 2023 +0100 android: Don't add "-editing" suffix to version/vendor Don't append "-editing" to the version string, which would then end up to be something like "24.2.0.0.alpha0+/7763190f7ec2/The Document Foundation-editing" when the build was configured with `--with-vendor="The Document Foundation"` and would result in the "About" dialog/widget saying "This release was supplied by The Document Foundation-editing." (s. `AboutDialogFragment#onCreateDialog`). While it's useful to have the different build flavors (with or without the experimental editing support), I see no need to have the build config reflected in the version string. (Whether experimental editing support was enabled during the build can easily be seen by checking whether the "Experimental Mode" option is available in the settings.) Change-Id: I48ddb3a842b9db4fc1f435683ed9d8e8e85898ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159079 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index f4f74338284c..f207ddedf267 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -82,7 +82,6 @@ android { strippedUIEditing { dimension "default" buildConfigField 'boolean', 'ALLOW_EDITING', 'true' -versionNameSuffix "-editing" } fullUI.dimension "default" }
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 3 ++- android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java| 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 9844a197bfe91e7adb74e9e5859c7fbfaaf99e28 Author: apurvapriyadarshi AuthorDate: Wed Sep 20 15:22:19 2023 +0530 Commit: Ilmari Lauhakangas CommitDate: Thu Sep 21 07:15:22 2023 +0200 tdf#147906 used StrictMath.hypot for Pythagorean addition Change-Id: I529dc199c2cc20ce91b7181f650c36db8d81fc9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157098 Reviewed-by: Bartosz Kosiorek Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java index c0da18ff70bd..b20d602a21cb 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -21,6 +21,7 @@ import org.mozilla.gecko.util.FloatUtils; import java.util.Timer; import java.util.TimerTask; +import java.lang.StrictMath; /* * Handles the kinetic scrolling and zooming physics for a layer controller. @@ -543,7 +544,7 @@ class JavaPanZoomController private float getVelocity() { float xvel = mX.getRealVelocity(); float yvel = mY.getRealVelocity(); -return (float) Math.sqrt(xvel * xvel + yvel * yvel); +return (float) StrictMath.hypot(xvel, yvel); } public PointF getVelocityVector() { diff --git a/android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java b/android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java index 4eb07a31f147..4eff380527d2 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java @@ -11,6 +11,8 @@ import android.graphics.PointF; import org.json.JSONException; import org.json.JSONObject; +import java.lang.StrictMath; + public final class PointUtils { public static PointF add(PointF one, PointF two) { return new PointF(one.x + two.x, one.y + two.y); @@ -30,7 +32,7 @@ public final class PointUtils { /* Computes the magnitude of the given vector. */ public static float distance(PointF point) { -return (float)Math.sqrt(point.x * point.x + point.y * point.y); +return (float)StrictMath.hypot(point.x, point.y); } /** Computes the scalar distance between two points. */
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- android/source/gradle.properties|3 +++ android/source/gradle/wrapper/gradle-wrapper.properties |4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 443e72497e5ae55facad8ad24ae10c82d6c25f4d Author: Michael Weghorn AuthorDate: Fri Aug 4 22:29:00 2023 +0200 Commit: Michael Weghorn CommitDate: Fri Sep 1 20:39:35 2023 +0200 android: Update Android Gradle Plugin to 8.1.0 ... and gradle to 8.0, as suggested by Android Studio. Also, as suggested, let the upgrade assistant set the following properties to keep the previous behavior for these for now instead of applying the new default behavior: android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false android.nonTransitiveRClass=false Those may be revisited in a follow-up step. See the Android Gradle Plugin release notes [1] for more details on the properties. [1] https://developer.android.com/build/releases/past-releases/agp-8-0-0-release-notes Change-Id: Iec2f5766c0888e0f38438290b8fd814494afd837 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155376 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 99365f08f2d4..f4f74338284c 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -21,7 +21,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.4.2' +classpath 'com.android.tools.build:gradle:8.1.0' } } diff --git a/android/source/gradle.properties b/android/source/gradle.properties index fe72551bf894..76578d6146a5 100644 --- a/android/source/gradle.properties +++ b/android/source/gradle.properties @@ -1,2 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx3072m diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index ef80eb5051f2..b22661d9bfd2 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 616a03c7addf78d50cf20e161becf17cb35b90ec Author: Michael Weghorn AuthorDate: Fri Aug 4 22:12:55 2023 +0200 Commit: Michael Weghorn CommitDate: Mon Aug 7 07:58:45 2023 +0200 android: Update com.google.android.material to 1.9.0 Change-Id: I52b2060cbf1f8eb06a49c58b8d35461aec99f3a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155375 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index d4776c88de90..99365f08f2d4 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -32,7 +32,7 @@ dependencies { "libreoffice.jar", "unoloader.jar" ]) -implementation 'com.google.android.material:material:1.8.0' +implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.multidex:multidex:2.0.1" }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0647aeaa4d3a2467c3cc12440df179d7a5853c2 Author: Michael Weghorn AuthorDate: Mon Mar 13 07:52:06 2023 +0100 Commit: Michael Weghorn CommitDate: Mon Mar 13 08:25:39 2023 + android: Update Android Gradle Plugin to 7.4.2 Change-Id: Idee4fddd7fd2b610fef194b86ace88469c3124da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148749 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 6b8e8d23ad83..d4776c88de90 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -21,7 +21,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.4.1' +classpath 'com.android.tools.build:gradle:7.4.2' } }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |6 ++ 1 file changed, 6 insertions(+) New commits: commit a344f152873e3b2f33411c391c3f57f604ae8bfa Author: Christian Lohmaier AuthorDate: Mon Feb 27 14:40:15 2023 +0100 Commit: Christian Lohmaier CommitDate: Tue Feb 28 18:27:16 2023 + add ipv6 enabled maven repository maven central so far doesn't support ipv6 on the primary URL (see https://issues.sonatype.org/browse/MVNCENTRAL-658 ), it is only enabled on a dedicated ipv6.repo1.maven.org URL currently. Add that one to the list of repositories so that ipv6-only hosts can also fetch the dependencies. (when using internal ipv4 as well, you'll also need to export JAVA_OPTS="-Djava.net.preferIPv6Addresses=true" since otherwise the gradle wrapper fails to download gradle) Change-Id: I22f0e07fd4e6bb518396f76db20c174e45588372 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147917 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/android/source/build.gradle b/android/source/build.gradle index 13bf0381d416..6b8e8d23ad83 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -5,6 +5,9 @@ apply from: 'liboSettings.gradle' allprojects { repositories { mavenCentral() +maven { +url "https://ipv6.repo1.maven.org/maven2; +} google() } } @@ -12,6 +15,9 @@ allprojects { buildscript { repositories { mavenCentral() +maven { +url "https://ipv6.repo1.maven.org/maven2; +} google() } dependencies {
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9fe3b3b09002188be4691e11eaa36113be0d80c1 Author: Michael Weghorn AuthorDate: Fri Feb 17 10:27:12 2023 +0100 Commit: Michael Weghorn CommitDate: Fri Feb 17 12:06:49 2023 + android: Update com.google.android.material to 1.8.0 Change-Id: I2e2049c5d832aa9ea82feaabf3a86fd8c87a9668 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147197 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 38a7cc801467..13bf0381d416 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -26,7 +26,7 @@ dependencies { "libreoffice.jar", "unoloader.jar" ]) -implementation 'com.google.android.material:material:1.7.0' +implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.multidex:multidex:2.0.1" }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4aa73a298f4849e222aa3c6111d8b5c57e417e4b Author: Michael Weghorn AuthorDate: Thu Feb 9 10:47:08 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Feb 9 10:50:15 2023 + android: Update Android Gradle Plugin to 7.4.1 Change-Id: I2a709e27d3ba42f0d1c2ae9510d2cbf1f38c484d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146682 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 113b62b4b09c..3f97fca4497e 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -15,7 +15,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.4.0' +classpath 'com.android.tools.build:gradle:7.4.1' } }
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08cfcea7fef6cde9eddcfa461fe1edff99dadafe Author: Yomnasalama AuthorDate: Mon Feb 6 18:32:36 2023 + Commit: Hossein CommitDate: Mon Feb 6 18:37:58 2023 + tdf#147906 Use Math.hypot() for Pythagorean addition Change-Id: I644947ca22f493bbc805c45334450db8d4b4808b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146137 Tested-by: Hossein Reviewed-by: Hossein diff --git a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java index f1973d980e32..c0da18ff70bd 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -426,7 +426,7 @@ class JavaPanZoomController private float panDistance(MotionEvent move) { float dx = mX.panDistance(move.getX(0)); float dy = mY.panDistance(move.getY(0)); -return (float) Math.sqrt(dx * dx + dy * dy); +return (float) Math.hypot(dx , dy); } private void track(float x, float y, long time) {
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- android/source/gradle/wrapper/gradle-wrapper.properties |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 20989728c78008f29c7f7bf72b3d0e5189835dc4 Author: Michael Weghorn AuthorDate: Wed Jan 18 10:35:38 2023 +0100 Commit: Michael Weghorn CommitDate: Wed Jan 18 12:38:43 2023 + android: Update Android Gradle Plugin to 7.4.0 ... and gradle to 7.5. Change-Id: If5156ab18dc500dafdfa4f8a0f6e6c2563acc4db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145711 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index b31b82eb1120..113b62b4b09c 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -15,7 +15,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.3.1' +classpath 'com.android.tools.build:gradle:7.4.0' } } diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index dcf5e2cb7b3e..ef80eb5051f2 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists
[Libreoffice-commits] core.git: android/source
android/source/res/menu/main.xml |8 +--- android/source/src/java/org/libreoffice/ToolbarController.java |2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit d993327eab0a2c9c8820c6528075b01de68b0ec6 Author: Michael Weghorn AuthorDate: Fri Dec 30 08:21:04 2022 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 30 11:17:40 2022 + android: Offer "Save" entry independent of edit actions Move the "Save" menu entry out of "group_edit_actions", which gets hidden when switching from edit to view mode when the experimental editing feature is enabled in Android Viewer. This e.g. makes sure that the "Save" entry is offered for the following scenario (just as the "Save as" entry is as well): * ensure experimental editing feature is enabled * open existing doc * edit the document * switch back to view mode by tapping the left-most item in the editing toolbar Since the doc was modified, the "Save" entry should be present then. Explicitly hide the entry when the experimental editing feature is disabled, since that no longer happens through "group_edit_actions" now. Change-Id: Ibe7736932021d7516e2fd3a09ae9276015fe0d56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144872 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml index 168817f68c5f..b0358a7cc360 100644 --- a/android/source/res/menu/main.xml +++ b/android/source/res/menu/main.xml @@ -35,15 +35,17 @@ android:title="@string/action_UNO_commands" android:orderInCategory="100" /> - + +
[Libreoffice-commits] core.git: android/source
android/source/res/drawable-xxxhdpi/decrementindent.png |binary android/source/res/drawable-xxxhdpi/incrementindent.png |binary android/source/res/drawable/ic_decrementindent.xml | 12 +++- android/source/res/drawable/ic_incrementindent.xml | 12 +++- 4 files changed, 6 insertions(+), 18 deletions(-) New commits: commit a510543a466aca0d152f82af24d16563f28455f0 Author: Michael Weghorn AuthorDate: Wed Dec 28 10:10:19 2022 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 28 10:32:13 2022 + android: Use PNG icons instead of vector image for compatibility Convert the drawable resources added in commit cfc73f3373f49770b859bc68cbf6bd987342f9ad Date: Fri Dec 23 23:20:26 2022 +0100 android: Add buttons to increase/decrease indent to use PNG images (PNG export of the SVG images used previously, using Inkscape) instead of vector drawables, since devices with old API versions apparently don't support these vector drawables. Trying to open any doc in an x86 AVD with API version 16 would result in LO crashing with this exception in ADB log: E/AndroidRuntime( 2948): java.lang.RuntimeException: Unable to start activity ComponentInfo{org.libreoffice/org.libreoffice.LibreOfficeMainActivity}: android.view.InflateException: Binary XML file line #281: Error inflating class ImageButton E/AndroidRuntime( 2948):at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2059) E/AndroidRuntime( 2948):at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2084) E/AndroidRuntime( 2948):at android.app.ActivityThread.access$600(ActivityThread.java:130) E/AndroidRuntime( 2948):at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1195) E/AndroidRuntime( 2948):at android.os.Handler.dispatchMessage(Handler.java:99) E/AndroidRuntime( 2948):at android.os.Looper.loop(Looper.java:137) E/AndroidRuntime( 2948):at android.app.ActivityThread.main(ActivityThread.java:4745) E/AndroidRuntime( 2948):at java.lang.reflect.Method.invokeNative(Native Method) E/AndroidRuntime( 2948):at java.lang.reflect.Method.invoke(Method.java:511) E/AndroidRuntime( 2948):at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:786) E/AndroidRuntime( 2948):at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:553) E/AndroidRuntime( 2948):at dalvik.system.NativeStart.main(Native Method) E/AndroidRuntime( 2948): Caused by: android.view.InflateException: Binary XML file line #281: Error inflating class ImageButton E/AndroidRuntime( 2948):at android.view.LayoutInflater.createViewFromTag(LayoutInflater.java:704) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:746) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.parseInclude(LayoutInflater.java:830) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:736) E/AndroidRuntime( 2948):at android.view.LayoutInflater.rInflate(LayoutInflater.java:749) E/AndroidRuntime( 2948):at android.view.LayoutInflater.inflate(LayoutInflater.java:489) E/AndroidRuntime( 2948):at android.view.LayoutInflater.inflate(LayoutInflater.java:396) E/AndroidRuntime( 2948):at android.view.LayoutInflater.inflate(LayoutInflater.java:352) E/AndroidRuntime( 2948):at androidx.appcompat.app.AppCompatDelegateImpl.setContentView(AppCompatDelegateImpl.java:710) E/AndroidRuntime( 2948):at androidx.appcompat.app.AppCompatActivity.setContentView(AppCompatActivity.java:195) E/AndroidRuntime( 2948):at org.libreoffice.LibreOfficeMainActivity.onCreate(LibreOfficeMainActivity.java:131) E/AndroidRuntime( 2948):at
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |6 +- android/source/src/java/org/libreoffice/LibreOfficeApplication.java |4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 037680488b56aa2c4eb21900168aa88ef35d5b07 Author: Michael Weghorn AuthorDate: Tue Dec 27 12:51:54 2022 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 28 08:28:48 2022 + android: Enable multidex, update com.google.android.material to 1.7.0 Release notes: https://github.com/material-components/material-components-android/releases/tag/1.7.0 With the material update in place, multidex needs to be enabled since the app has minSdkVersion 16 (i.e. smaller than 21) and now references more then 65,536 methods, see [1] for more background. Therefore, carry out the changes to support multidex as mentioned in [2]. Without enabling multidex, the build would fail like this: > Task :mergeExtDexStrippedUIDebug FAILED ERROR:D8: Cannot fit requested classes in a single dex file (# methods: 68864 > 65536) com.android.builder.dexing.DexArchiveMergerException: Error while merging dex archives: The number of method references in a .dex file cannot exceed 64K. Learn how to resolve this issue at https://developer.android.com/tools/building/multidex.html at com.android.builder.dexing.D8DexArchiveMerger.getExceptionToRethrow(D8DexArchiveMerger.java:151) at com.android.builder.dexing.D8DexArchiveMerger.mergeDexArchives(D8DexArchiveMerger.java:138) at com.android.build.gradle.internal.tasks.DexMergingWorkAction.merge(DexMergingTask.kt:859) at com.android.build.gradle.internal.tasks.DexMergingWorkAction.run(DexMergingTask.kt:805) at com.android.build.gradle.internal.profile.ProfileAwareWorkAction.execute(ProfileAwareWorkAction.kt:74) at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63) at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66) at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62) at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:97) at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62) at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44) at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:199) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:157) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53) at org.gradle.internal.operations.DefaultBuildOperationExecutor.call(DefaultBuildOperationExecutor.java:73) at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41) at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59) at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$2(DefaultWorkerExecutor.java:205) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:187) at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:120) at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:162) at org.gradle.internal.Factories$1.create(Factories.java:31) at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:270) at
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e690752d5643ffaf4da8778768e5e080476b2427 Author: Michael Weghorn AuthorDate: Tue Dec 27 12:46:28 2022 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 28 08:28:17 2022 + android: Update compileSdkVersion/targetSdkVersion to 33 API version 33 refers to Android 13. I didn't notice anything requiring changes when quickly going over the release notes for all apps running on Android 13 [1] and apps targeting Android 13 [2]. [1] https://developer.android.com/about/versions/13/behavior-changes-all [2] https://developer.android.com/about/versions/13/behavior-changes-13 Change-Id: I8b68f3bf0afc4c00ecd3412a8fdf0581f2d6bbc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144837 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 581216e603fc..37239d214f70 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -32,7 +32,7 @@ dependencies { android { namespace 'org.libreoffice' -compileSdkVersion 32 +compileSdkVersion 33 // uses non-conventional source layout, so need to reconfigure accordingly // ToDo move to conventional layout, so stuff can be stripped down. sourceSets { @@ -48,7 +48,7 @@ android { } defaultConfig { minSdkVersion 16 -targetSdkVersion 32 +targetSdkVersion 33 vectorDrawables.useSupportLibrary = true } buildTypes {
[Libreoffice-commits] core.git: android/source
android/source/AndroidManifest.xml |3 +-- android/source/build.gradle|1 + 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit afcdd294b3cbca93810ad1a94df18770d0a09bba Author: Michael Weghorn AuthorDate: Tue Dec 27 11:45:56 2022 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 28 08:27:54 2022 + android: Set namespace in build.gradle instead of manifest Switch from the now deprecated way, as mentioned in commit 7347d911fa295c31262a0f576c5b2f3f14ce017d Author: Michael Weghorn Date: Fri Dec 23 18:29:44 2022 +0100 android: Update Android Gradle Plugin to 7.3.1 ... and gradle to 7.4. Relevant entry from the release notes [1] that will be addressed in a follow-up commit: > # Package attribute in manifest file is deprecated > > Starting with AGP 7.3.0-alpha04, if you use Gradle to build your > project, AGP generates a warning if you use the package attribute in the > manifest file. To set the namespace for your app, use the namespace > property in the module-level build.gradle file. To learn more, see Set a > namespace > [https://developer.android.com/studio/build/configure-app-module#set-namespace]. > > To get help moving to the new namespace DSL, use the AGP Upgrade > Assistant (Tools > AGP Upgrade Assistant). [1] https://developer.android.com/studio/releases/gradle-plugin#7-3-0 Change-Id: I8b196e53fb9b3fb7e9314719fdb7e0f2254abd10 Note that this is unrelated to the Android application ID [1] that can be set with autogen param `--with-android-package-name`. [1] https://developer.android.com/studio/build/configure-app-module#set-application-id Change-Id: I146dab19228d83b1beb6408743c0232e1ba1d060 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144836 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index c50ad77ae71d..4a7c137878fb 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -1,7 +1,6 @@ http://schemas.android.com/apk/res/android; -android:installLocation="${installLocation}" -package="org.libreoffice"> +android:installLocation="${installLocation}"> diff --git a/android/source/build.gradle b/android/source/build.gradle index 52ca33f0994e..581216e603fc 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -31,6 +31,7 @@ dependencies { } android { +namespace 'org.libreoffice' compileSdkVersion 32 // uses non-conventional source layout, so need to reconfigure accordingly // ToDo move to conventional layout, so stuff can be stripped down.
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit d23671de498d5531f1f84fa7f0ee21773551ef8a Author: Michael Weghorn AuthorDate: Tue Dec 27 10:33:59 2022 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 28 08:27:31 2022 + android: Include Impress's layout.xml into app It's needed since commit daab698b346e5e40b67f1e15c796c4e399ccaf8a Date: Tue Nov 22 14:07:12 2022 +0200 sd: replace hardcoded table styles with xml file Without it being included into the app/APK, opening any presentation in Android Viewer file would fail, with this in ADB log: 12-27 10:22:45.329 9811 9862 E libo:sal/osl/unx/file: failed to open /assets/share/config/soffice.cfg/simpress/styles.xml 12-27 10:22:45.332 9811 9862 W svl.items: 1:svl/source/items/itempool.cxx:442: old secondary pool: EditEngineItemPool of pool: XOutdevItemPool must be empty. 12-27 10:22:45.337 9811 9862 I LOKitTileProvider: > mOffice.documentLoad() returned null, trying to restart 'Office' and loading again Change-Id: I677476bda146be2cd3ebe18da91bcb8f2a796fd3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144835 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index a407c2f81cf2..52ca33f0994e 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -139,11 +139,12 @@ task copyAssets(type: Copy) { description "copies assets that can be accessed within the installed apk" into 'assets' -// include icons +// include icons and Impress styles into ('share') { into ('config') { from ("${liboInstdir}/share/config") -includes = ['images_**.zip'] +includes = ['images_**.zip', +'**/simpress/styles.xml'] } }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- android/source/gradle/wrapper/gradle-wrapper.properties |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3826a7df9aa447bec08a3b056180778ad8c953af Author: Michael Weghorn AuthorDate: Fri Dec 23 18:29:44 2022 +0100 Commit: Michael Weghorn CommitDate: Wed Dec 28 08:27:04 2022 + android: Update Android Gradle Plugin to 7.3.1 ... and gradle to 7.4. Relevant entry from the release notes [1] that will be addressed in a follow-up commit: > # Package attribute in manifest file is deprecated > > Starting with AGP 7.3.0-alpha04, if you use Gradle to build your > project, AGP generates a warning if you use the package attribute in the > manifest file. To set the namespace for your app, use the namespace > property in the module-level build.gradle file. To learn more, see Set a > namespace > [https://developer.android.com/studio/build/configure-app-module#set-namespace]. > > To get help moving to the new namespace DSL, use the AGP Upgrade > Assistant (Tools > AGP Upgrade Assistant). [1] https://developer.android.com/studio/releases/gradle-plugin#7-3-0 Change-Id: I8b196e53fb9b3fb7e9314719fdb7e0f2254abd10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144834 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 68e68f8d57ae..a407c2f81cf2 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -15,7 +15,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.2.2' +classpath 'com.android.tools.build:gradle:7.3.1' } } diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index e97856541453..e4ca53e04840 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
[Libreoffice-commits] core.git: android/source
android/source/res/drawable/ic_decrementindent.xml|9 android/source/res/drawable/ic_incrementindent.xml|9 android/source/res/layout/toolbar_bottom.xml | 21 ++ android/source/src/java/org/libreoffice/FormattingController.java |6 ++ 4 files changed, 45 insertions(+) New commits: commit cfc73f3373f49770b859bc68cbf6bd987342f9ad Author: Michael Weghorn AuthorDate: Fri Dec 23 23:20:26 2022 +0100 Commit: Michael Weghorn CommitDate: Fri Dec 23 23:24:03 2022 + android: Add buttons to increase/decrease indent This adds two buttons to the formatting toolbar to increase/decrease the indent, using the corresponding UNO commands. These can be used when the experimental editing mode for Android Viewer is enabled. The drawable resources were created using the corresponding sifr_svg icons (incrementindent.svg, decrementindent.svg). Change-Id: Id8f0fc9a5ea686b474ec9a4b4dcdf23407e9ac98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144789 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/drawable/ic_decrementindent.xml b/android/source/res/drawable/ic_decrementindent.xml new file mode 100644 index ..e67a75ad1873 --- /dev/null +++ b/android/source/res/drawable/ic_decrementindent.xml @@ -0,0 +1,9 @@ +http://schemas.android.com/apk/res/android; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24" +android:viewportHeight="24"> + + diff --git a/android/source/res/drawable/ic_incrementindent.xml b/android/source/res/drawable/ic_incrementindent.xml new file mode 100644 index ..3d8e948488c9 --- /dev/null +++ b/android/source/res/drawable/ic_incrementindent.xml @@ -0,0 +1,9 @@ +http://schemas.android.com/apk/res/android; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24" +android:viewportHeight="24"> + + diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index 7d420f35cbca..8ac99a28650d 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -269,6 +269,27 @@ android:paddingBottom="12dp" android:paddingTop="12dp" android:src="@drawable/ic_format_bullets" /> + + + + + diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/source/src/java/org/libreoffice/FormattingController.java index 49cffabf72d8..49e81eb69784 100644 --- a/android/source/src/java/org/libreoffice/FormattingController.java +++ b/android/source/src/java/org/libreoffice/FormattingController.java @@ -48,6 +48,8 @@ class FormattingController implements View.OnClickListener { mContext.findViewById(R.id.button_insertFormatListBullets).setOnClickListener(this); mContext.findViewById(R.id.button_insertFormatListNumbering).setOnClickListener(this); + mContext.findViewById(R.id.button_increaseIndent).setOnClickListener(this); + mContext.findViewById(R.id.button_decreaseIndent).setOnClickListener(this); mContext.findViewById(R.id.button_bold).setOnClickListener(this); mContext.findViewById(R.id.button_italic).setOnClickListener(this); @@ -89,6 +91,10 @@ class FormattingController implements View.OnClickListener { LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultBullet")); } else if (buttonId == R.id.button_insertFormatListNumbering) { LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultNumbering")); +} else if (buttonId == R.id.button_increaseIndent) { +LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:IncrementIndent")); +} else if (buttonId == R.id.button_decreaseIndent) { +LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DecrementIndent")); } else if (buttonId == R.id.button_bold) { LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Bold")); } else if (buttonId == R.id.button_italic) {
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/FontController.java |5 + android/source/src/java/org/libreoffice/InvalidationHandler.java |2 +- 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 70d9e7eadb1069b5e7a1909c671b9348b740cca1 Author: Justin Luth AuthorDate: Tue Sep 20 20:25:37 2022 -0400 Commit: Justin Luth CommitDate: Tue Dec 20 00:15:43 2022 + tdf#85592 android: .uno:BackColor deprecated, use .uno:CharBackColor Follow-up. I didn't want to include it in the main deprecation patch. No good reason - android is just too different and untestable by me. Change-Id: I661211aea619af256e38dc685fdd0662e5aa7272 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140284 Reviewed-by: Justin Luth Tested-by: Jenkins diff --git a/android/source/src/java/org/libreoffice/FontController.java b/android/source/src/java/org/libreoffice/FontController.java index e0161076a5a1..72f35d8b42d8 100644 --- a/android/source/src/java/org/libreoffice/FontController.java +++ b/android/source/src/java/org/libreoffice/FontController.java @@ -171,12 +171,9 @@ public class FontController implements AdapterView.OnItemSelectedListener { if(mActivity.getTileProvider().isSpreadsheet()){ json.put("BackgroundColor", valueJson); LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:BackgroundColor", json.toString())); -}else if(mActivity.getTileProvider().isPresentation()){ +}else { json.put("CharBackColor", valueJson); LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:CharBackColor", json.toString())); -}else { -json.put("BackColor", valueJson); -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:BackColor", json.toString())); } changeFontBackColorBoxColor(color); diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java b/android/source/src/java/org/libreoffice/InvalidationHandler.java index 0f3f1dd7b889..c48127cce67f 100644 --- a/android/source/src/java/org/libreoffice/InvalidationHandler.java +++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java @@ -342,7 +342,7 @@ public class InvalidationHandler implements Document.MessageCallback, Office.Mes mContext.getFormattingController().onToggleStateChanged(Document.NUMBERED_LIST, pressed); } else if (parts[0].equals(".uno:Color")) { mContext.getFontController().colorPaletteListener.updateColorPickerPosition(Integer.parseInt(value)); -} else if (mContext.getTileProvider().isTextDocument() && parts[0].equals(".uno:BackColor")) { +} else if (mContext.getTileProvider().isTextDocument() && (parts[0].equals(".uno:BackColor") || parts[0].equals(".uno:CharBackColor"))) { mContext.getFontController().backColorPaletteListener.updateColorPickerPosition(Integer.parseInt(value)); } else if (mContext.getTileProvider().isPresentation() && parts[0].equals(".uno:CharBackColor")) { mContext.getFontController().backColorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));
[Libreoffice-commits] core.git: android/source bin/find-german-comments configure.ac .git-hooks/commit-msg odk/config slideshow/qa
.git-hooks/commit-msg |4 ++-- android/source/gradlew |4 ++-- bin/find-german-comments |2 +- configure.ac |6 +++--- odk/config/configure.pl|4 ++-- slideshow/qa/debug/nodetree.sh |2 +- 6 files changed, 11 insertions(+), 11 deletions(-) New commits: commit fd42cea5f301a10cdeaa29959f04b111de534132 Author: Rene Engelhard AuthorDate: Wed Sep 7 21:34:42 2022 +0200 Commit: Christian Lohmaier CommitDate: Thu Sep 8 14:43:53 2022 +0200 replace egrep/fgrep calls with grep -E/grep -F as egrep/fgrep is deprecated since long amd grep 3.8+ now actually warns (e.g. "egrep: warning: egrep is obsolescent; using grep -E") Change-Id: I5b10f05dffdd09081deb05cef974e3cdb2907315 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139614 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg index eebca62cb6f7..950a6b709d9a 100755 --- a/.git-hooks/commit-msg +++ b/.git-hooks/commit-msg @@ -49,8 +49,8 @@ if [ "$len" -gt 79 ] ; then fi fdo_regex='fdo#[0-9]+' -if egrep -q "$fdo_regex" $1; then -for bugid in `head -n 1 $1 |egrep -o "$fdo_regex" |sed 's/fdo#//'` +if grep -E -q "$fdo_regex" $1; then +for bugid in `head -n 1 $1 | grep -E -o "$fdo_regex" |sed 's/fdo#//'` do if [ "`echo $bugid |sed 's/fdo#//'`" -gt 88775 ]; then abort "$1" "The first line contains a suspicious fdo# rereference: 'fdo#$bugid', did you mean tdf#?" diff --git a/android/source/gradlew b/android/source/gradlew index 91a7e269e19d..b7029853b09f 100755 --- a/android/source/gradlew +++ b/android/source/gradlew @@ -130,8 +130,8 @@ if $cygwin ; then # Now convert the arguments - kludge to limit ourselves to /bin/sh i=0 for arg in "$@" ; do -CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` -CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option +CHECK=`echo "$arg"|grep -E -c "$OURCYGPATTERN" -` +CHECK2=`echo "$arg"|grep -E -c "^-"` ### Determine if an option if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then### Added a condition eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` diff --git a/bin/find-german-comments b/bin/find-german-comments index a38b435ce870..175af6f22420 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -235,7 +235,7 @@ class Parser: # Change into the given dir, so "git ls-tree" does work. os.chdir(directory) -sock = os.popen(r"git ls-tree -r HEAD --name-only |egrep '\.(c|cc|cpp|cxx|h|hxx|mm)$'") +sock = os.popen(r"git ls-tree -r HEAD --name-only | grep -E '\.(c|cc|cpp|cxx|h|hxx|mm)$'") lines = sock.readlines() sock.close() diff --git a/configure.ac b/configure.ac index 7b03df8ee0aa..7c82578933cb 100644 --- a/configure.ac +++ b/configure.ac @@ -2945,7 +2945,7 @@ AC_SUBST(GNUPARALLEL) AC_MSG_CHECKING([for GNU or BSD tar]) for a in $GNUTAR gtar gnutar tar bsdtar /usr/sfw/bin/gtar; do -$a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null +$a --version 2> /dev/null | grep -E "GNU|bsdtar" 2>&1 > /dev/null if test $? -eq 0; then GNUTAR=$a break @@ -2958,11 +2958,11 @@ fi AC_SUBST(GNUTAR) AC_MSG_CHECKING([for tar's option to strip components]) -$GNUTAR --help 2> /dev/null | egrep "bsdtar|strip-components" 2>&1 >/dev/null +$GNUTAR --help 2> /dev/null | grep -E "bsdtar|strip-components" 2>&1 >/dev/null if test $? -eq 0; then STRIP_COMPONENTS="--strip-components" else -$GNUTAR --help 2> /dev/null | egrep "strip-path" 2>&1 >/dev/null +$GNUTAR --help 2> /dev/null | grep -E "strip-path" 2>&1 >/dev/null if test $? -eq 0; then STRIP_COMPONENTS="--strip-path" else diff --git a/odk/config/configure.pl b/odk/config/configure.pl index f3d0e08b3440..756db5a3c76b 100755 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -242,7 +242,7 @@ while ( (!$main::correctVersion) && } else { #check version -my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | egrep Zip | head -n 1`; +my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | grep -E Zip | head -n 1`; $testVersion =~ s#Zip ([\d.]+) .*#$1#go; if ( $testVersion eq "") { @@ -414,7 +414,7 @@ while ( (!$main::correctVersion) && } else { #check version -my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1 | egrep "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e 's#".*##'`; +my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1 | grep -E "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e 's#".*##'`; $testVersion =~ s#([^\n]+)\n#$1#go; $main::correctVersion
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |1 + 1 file changed, 1 insertion(+) New commits: commit e77bfe281403e49c58730489e94b62032c296e75 Author: Michael Weghorn AuthorDate: Mon Aug 8 09:27:39 2022 +0200 Commit: Michael Weghorn CommitDate: Mon Aug 8 13:23:15 2022 +0200 android: Add scrollbars.ui into APK That UI file was added in commit 4bc62c4e9b5b4eab6e2e40577789c435dce59f66 Date: Thu Aug 4 15:33:51 2022 +0100 split SwScrollbar up for reuse of adaptor Include it for Android. Without it, trying to load/display any document would result in Android Viewer crashing or getting stuck, with this in the ADB log: 08-08 09:22:20.102 6064 6256 D libo:sal/osl/unx/file: double-slash in path: /assets//config/soffice.cfg/svt/ui/scrollbars.ui 08-08 09:22:20.102 6064 6256 E libo:sal/osl/unx/file: miss cache: failed to open /assets//config/soffice.cfg/svt/ui/scrollbars.ui 08-08 09:22:20.102 6064 6256 W vcl.builder: 23:vcl/source/window/builder.cxx:480: DBG_UNHANDLED_EXCEPTION in VclBuilder 08-08 09:22:20.102 6064 6256 W vcl.builder: when: Unable to read .ui file exception: void 08-08 09:22:20.103 6064 6256 I LOKitTileProvider: > mOffice.documentLoad() returned null, trying to restart 'Office' and loading again Change-Id: I0938d77dc9553d8acc7b2bdd4a72b5299b4ec1a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137943 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 13d4d1b0bb14..68e68f8d57ae 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -175,6 +175,7 @@ task copyAssets(type: Copy) { '**/hfmenubutton.ui', '**/inforeadonlydialog.ui', '**/pbmenubutton.ui', +'**/scrollbars.ui', '**/tabbuttons.ui', '**/tabviewbar.ui' } }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |1 - 1 file changed, 1 deletion(-) New commits: commit fd95bf6dea0bfa5a9fd1254c11854dec4a2cdcff Author: Michael Weghorn AuthorDate: Mon Aug 8 09:09:21 2022 +0200 Commit: Michael Weghorn CommitDate: Mon Aug 8 13:22:45 2022 +0200 android: Drop empty main.jni.srcDirs from sourceSets This was shown as a recommended step in Android Studio when the update to Android Gradle Plugin 7.2.2 was suggested: > *Remove jni source directory from sourceSets* > > The jni block in an android > sourceSet does nothing, and will be removed in Android Gradle Plugin > version 8.0.0. Change-Id: I3378926047d5ad86548d0bf800e022b74efb5e09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137942 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 0a6c1aefa454..13d4d1b0bb14 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -40,7 +40,6 @@ android { main.res.srcDirs = ['res', 'res_generated'] main.java.srcDirs = ['../Bootstrap/src', 'src/java'] main.jniLibs.srcDirs = ["${liboJniLibsdir}"] -main.jni.srcDirs = [] // don't attempt to build native-lib via gradle // the configuration data that might be stripped or not fullUI.assets.srcDirs 'assets_fullUI' strippedUI.assets.srcDirs 'assets_strippedUI'
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 495efc3396f04a6dc2200b33d9969f125b2a79c8 Author: Michael Weghorn AuthorDate: Mon Aug 8 09:08:07 2022 +0200 Commit: Michael Weghorn CommitDate: Mon Aug 8 11:33:49 2022 +0200 android: Update Android Gradle Plugin to 7.2.2 Change-Id: I3235716498168ca5eebf71ebf6f5ee571af7a72d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137941 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index a1c5a43c0d87..0a6c1aefa454 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -15,7 +15,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.2.1' +classpath 'com.android.tools.build:gradle:7.2.2' } }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3318742094157b6baf57f2294731b8dec8da73ad Author: Michael Weghorn AuthorDate: Mon Jun 13 11:11:16 2022 +0200 Commit: Michael Weghorn CommitDate: Tue Jun 14 06:38:57 2022 +0200 android: Update com.google.android.material to 1.6.1 Change-Id: If5aebe347534745065b371190abffce2421655f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135729 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 26da7cf9c3b9..a1c5a43c0d87 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -26,7 +26,7 @@ dependencies { "libreoffice.jar", "unoloader.jar" ]) -implementation 'com.google.android.material:material:1.6.0' +implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 553750d5763b2e605cc8990d81c5588db4319b62 Author: Michael Weghorn AuthorDate: Sat May 28 12:20:34 2022 +0200 Commit: Michael Weghorn CommitDate: Sat May 28 13:28:10 2022 +0200 android: Update Android Gradle Plugin to 7.2.1 Release notes [1]: > 7.2.1 (May 2022) > > This minor update corresponds to the release of Android Studio > Chipmunk Patch 1 and includes the following bug fixes: > > bundletool does not package baseline profiles correctly [2] > > To see the other bug fixes included in this release, see the Android > Studio Chipmunk Patch 1 release notes. [3] [1] https://developer.android.com/studio/releases/gradle-plugin?buildsystem=ndk-build#7-2-0 [2] https://issuetracker.google.com/issues/230361284 [3] https://developer.android.com/studio/releases#patch-releases Change-Id: I57f37ea3786003dba4d95b291ddf6b0b44dccaa4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135053 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 0e0cd6381053..26da7cf9c3b9 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -15,7 +15,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.2.0' +classpath 'com.android.tools.build:gradle:7.2.1' } }
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit be3f29bd103bf058eeef063823fd4049448ce27f Author: Michael Weghorn AuthorDate: Thu May 26 09:48:27 2022 +0200 Commit: Michael Weghorn CommitDate: Thu May 26 22:06:04 2022 +0200 android: Update compileSdkVersion/targetSdkVersion to 32 API version 32 refers to the Android 12L feature drop (Android 12.1). According to [1], "12L is a special feature drop that makes Android 12 even better on tablets and foldable devices." When getting over the list of behavior changes for apps targeting Android 12, I didn't realize anyting relevant specific to API level 32 not yet in API level 31 as well, so there seems to be no need for any special adjustments for this update on top of commit 2ab389b251744fa7f3f6b060c09746e59d87f3b1 Date: Tue Apr 19 10:33:27 2022 +0200 android: Update compileSdkVersion/targetSdkVersion to 31 [1] https://developer.android.com/about/versions/12/12L Change-Id: Ic99c4ee5b81b6584648fa4717e23cc7f3c78bdab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134988 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index adb9b067d1b4..0e0cd6381053 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -31,7 +31,7 @@ dependencies { } android { -compileSdkVersion 31 +compileSdkVersion 32 // uses non-conventional source layout, so need to reconfigure accordingly // ToDo move to conventional layout, so stuff can be stripped down. sourceSets { @@ -48,7 +48,7 @@ android { } defaultConfig { minSdkVersion 16 -targetSdkVersion 31 +targetSdkVersion 32 vectorDrawables.useSupportLibrary = true } buildTypes {
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97b1a21f9b7b7ed8a24da4a83a043e82de46683c Author: Michael Weghorn AuthorDate: Thu May 26 09:18:05 2022 +0200 Commit: Michael Weghorn CommitDate: Thu May 26 22:05:20 2022 +0200 android: Update androidx.constraintlayout to 2.1.4 Change-Id: If2edff8006c3aa904d40dabf679d5ed0b0fd0127 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134987 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 22cbb858d4fa..adb9b067d1b4 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -27,7 +27,7 @@ dependencies { "unoloader.jar" ]) implementation 'com.google.android.material:material:1.6.0' -implementation 'androidx.constraintlayout:constraintlayout:2.1.3' +implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } android {
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b6258ff75dd3c19e8309a33c85e17e8a76b388cf Author: Michael Weghorn AuthorDate: Thu May 26 09:16:42 2022 +0200 Commit: Michael Weghorn CommitDate: Thu May 26 22:04:58 2022 +0200 android: Update com.google.android.material to 1.6.0 Change-Id: Iac3831d400d29b45be82d2585ca1454ed22676be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134986 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 137501b39654..22cbb858d4fa 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -26,7 +26,7 @@ dependencies { "libreoffice.jar", "unoloader.jar" ]) -implementation 'com.google.android.material:material:1.5.0' +implementation 'com.google.android.material:material:1.6.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' }
[Libreoffice-commits] core.git: android/source
android/source/gradle.properties |1 - 1 file changed, 1 deletion(-) New commits: commit 6e24713c8cb4d2c1aec8ee647c07c6b03de0063a Author: Michael Weghorn AuthorDate: Fri May 20 11:35:49 2022 +0200 Commit: Michael Weghorn CommitDate: Sat May 21 09:18:38 2022 +0200 android: Drop 'android.enableJetifier=true' From the Android Gradle Plugin 7.2.0 release notes [1]: > Jetifier warning and check in Build Analyzer Build Analyzer now displays > a warning if your project's gradle.properties file includes > android.enableJetifier=true. This flag was introduced in a previous > version of Android Studio to enable AndroidX for libraries that don't > support AndroidX natively. However, the library ecosystem has mostly > moved to support AndroidX natively and the Jetifier flag is probably no > longer needed by your project. Additionally, the flag can lead to slower > build performance. If you see this warning, you can run a check within > Build Analyzer to confirm if the flag can be removed. Android Viewer has no dependencides requiring Android Support Libraries, so drop the `android.enableJetifier=true` flag. [1] https://developer.android.com/studio/releases/gradle-plugin?buildsystem=ndk-build#jetifier-build-analyzer Change-Id: I6943b2e82e5b226286be288f9ed30944c541eb1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134673 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/gradle.properties b/android/source/gradle.properties index 414d53485e7f..fe72551bf894 100644 --- a/android/source/gradle.properties +++ b/android/source/gradle.properties @@ -1,3 +1,2 @@ -android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx3072m
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- android/source/gradle/wrapper/gradle-wrapper.properties |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit b62509e43c355d98b3ef26b1f55045cffcb1f486 Author: Michael Weghorn AuthorDate: Fri May 20 11:24:39 2022 +0200 Commit: Michael Weghorn CommitDate: Sat May 21 09:17:48 2022 +0200 android: Update Android Gradle Plugin to 7.2.0 ... and gradle to 7.3.3, as suggested by Android Studio. The Android Gradle plugin release notes for 7.2.0 [1] mention a new warning in Build Analyzer when `android.enableJetifier=true` is set. That will be handled in a follow-up commit. [1] https://developer.android.com/studio/releases/gradle-plugin?buildsystem=ndk-build#jetifier-build-analyzer Change-Id: I9427f8b878346edc3c6e30be1d41fcc4dc32540e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134672 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/build.gradle b/android/source/build.gradle index 80427b8b73b1..137501b39654 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -15,7 +15,7 @@ buildscript { google() } dependencies { -classpath 'com.android.tools.build:gradle:7.1.3' +classpath 'com.android.tools.build:gradle:7.2.0' } } diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index 2d5e5400a6ed..e97856541453 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/PageView.java |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit e5fb120a32d04e241b35a7e63894c744196f576b Author: Andrea Gelmini AuthorDate: Mon May 9 12:15:41 2022 +0200 Commit: Andrea Gelmini CommitDate: Mon May 9 23:45:49 2022 +0200 Fix typo in code Change-Id: I6fae9a4df450f80ee2af59e271a8cb1dd8bc918f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134047 Reviewed-by: Julien Nabet Reviewed-by: Michael Weghorn Tested-by: Jenkins diff --git a/android/source/src/java/org/libreoffice/ui/PageView.java b/android/source/src/java/org/libreoffice/ui/PageView.java index 11b365f2bbcc..4c3f69562250 100644 --- a/android/source/src/java/org/libreoffice/ui/PageView.java +++ b/android/source/src/java/org/libreoffice/ui/PageView.java @@ -22,21 +22,21 @@ public class PageView extends View{ public PageView(Context context ) { super(context); bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page); -intialise(); +initialise(); } public PageView(Context context, AttributeSet attrs) { super(context, attrs); bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page); Log.d(LOGTAG, bmp.toString()); -intialise(); +initialise(); } public PageView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);//load a "page" -intialise(); +initialise(); } -private void intialise(){ +private void initialise(){ mPaintBlack = new Paint(); mPaintBlack.setARGB(255, 0, 0, 0); Log.d(LOGTAG, " Doing some set-up");
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ToolbarController.java | 149 -- 1 file changed, 70 insertions(+), 79 deletions(-) New commits: commit 1bb9036e90688929fec61edbacae768afef9f5db Author: Michael Weghorn AuthorDate: Sat May 7 23:17:03 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:29:20 2022 +0200 android: Don't use res Id in switch-case (ToolbarController) Like Change-Id I9d563b6ad4ed70a891c583a82331dd80db5956dc, "android: Avoid using res ID in switch-case (FormattingController)", but for `TollbarController`. Change-Id: I40f23b6a91ddf0bb7e90c3b3b690fe332cd874ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133999 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ToolbarController.java b/android/source/src/java/org/libreoffice/ToolbarController.java index f0fbb139484d..9f5c5309a523 100644 --- a/android/source/src/java/org/libreoffice/ToolbarController.java +++ b/android/source/src/java/org/libreoffice/ToolbarController.java @@ -162,85 +162,76 @@ public class ToolbarController implements Toolbar.OnMenuItemClickListener { @Override public boolean onMenuItemClick(MenuItem item) { -switch (item.getItemId()) { -case R.id.action_keyboard: -mContext.showSoftKeyboard(); -break; -case R.id.action_format: -mContext.showFormattingToolbar(); -break; -case R.id.action_about: -mContext.showAbout(); -return true; -case R.id.action_save: -mContext.getTileProvider().saveDocument(); -return true; -case R.id.action_save_as: -mContext.saveDocumentAs(); -return true; -case R.id.action_parts: -mContext.openDrawer(); -return true; -case R.id.action_exportToPDF: -mContext.exportToPDF(); -return true; -case R.id.action_print: -mContext.getTileProvider().printDocument(); -return true; -case R.id.action_settings: -mContext.showSettings(); -return true; -case R.id.action_search: -mContext.showSearchToolbar(); -return true; -case R.id.action_undo: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Undo")); -return true; -case R.id.action_redo: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Redo")); -return true; -case R.id.action_presentation: -mContext.preparePresentation(); -return true; -case R.id.action_add_slide: -mContext.addPart(); -return true; -case R.id.action_add_worksheet: -mContext.addPart(); -return true; -case R.id.action_rename_worksheet: -case R.id.action_rename_slide: -mContext.renamePart(); -return true; -case R.id.action_delete_worksheet: -mContext.deletePart(); -return true; -case R.id.action_delete_slide: -mContext.deletePart(); -return true; -case R.id.action_back: -hideClipboardActions(); -return true; -case R.id.action_copy: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Copy")); -clipData = ClipData.newPlainText("clipboard data", clipboardText); -clipboardManager.setPrimaryClip(clipData); -Toast.makeText(mContext, mContext.getResources().getString(R.string.action_text_copied), Toast.LENGTH_SHORT).show(); -return true; -case R.id.action_paste: -clipData = clipboardManager.getPrimaryClip(); -ClipData.Item clipItem = clipData.getItemAt(0); -mContext.setDocumentChanged(true); -return mContext.getTileProvider().paste("text/plain;charset=utf-16", clipItem.getText().toString()); -case R.id.action_cut: -clipData = ClipData.newPlainText("clipboard data", clipboardText); -clipboardManager.setPrimaryClip(clipData); -LOKitShell.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL)); -mContext.setDocumentChanged(true); -return true; -case R.id.action_UNO_commands: -mContext.showUNOCommandsToolbar(); -return true; +final int itemId = item.getItemId(); +if (itemId == R.id.action_keyboard) { +mContext.showSoftKeyboard(); +} else if
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/SearchController.java | 11 +- 1 file changed, 2 insertions(+), 9 deletions(-) New commits: commit dcc6b286ea58bca21fd6a85fde2bffa2cce8d564 Author: Michael Weghorn AuthorDate: Sat May 7 23:03:20 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:28:38 2022 +0200 android: Don't use res ID in switch-case (SearchController) Addresses this Lint warning: > ../../src/java/org/libreoffice/SearchController.java:73: Resource IDs > will be non-final by default in Android Gradle Plugin version 8.0, avoid > using them in switch case statements There's no need to explicitly set `SearchDirection.DOWN` for `R.id.button_search_down` since it has previously been set as default value anyway. Change-Id: I283c00b97e1417f5dc3a48922238df7a29032137 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133998 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/SearchController.java b/android/source/src/java/org/libreoffice/SearchController.java index 8bdf42e8be8c..6095e1fd2afe 100644 --- a/android/source/src/java/org/libreoffice/SearchController.java +++ b/android/source/src/java/org/libreoffice/SearchController.java @@ -69,15 +69,8 @@ public class SearchController implements View.OnClickListener { ImageButton button = (ImageButton) view; SearchDirection direction = SearchDirection.DOWN; -switch(button.getId()) { -case R.id.button_search_down: -direction = SearchDirection.DOWN; -break; -case R.id.button_search_up: -direction = SearchDirection.UP; -break; -default: -break; +if (button.getId() == R.id.button_search_up) { +direction = SearchDirection.UP; } String searchText = ((EditText) mActivity.findViewById(R.id.search_string)).getText().toString();
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/FormattingController.java | 133 +++--- 1 file changed, 51 insertions(+), 82 deletions(-) New commits: commit 1c5a8b5eafd67001875a0270459a1a9dd7b605d8 Author: Michael Weghorn AuthorDate: Sat May 7 22:49:18 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:27:52 2022 +0200 android: Avoid using res ID in switch-case (FormattingController) Adresses Lint warnings like this in FormattingController: > ../../src/java/org/libreoffice/FormattingController.java:89: Resource > IDs will be non-final by default in Android Gradle Plugin version 8.0, > avoid using them in switch case statements > > 86 > 87 switch(button.getId()) { > 88 > 89 case R.id.button_insertFormatListBullets: > 90 LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultBullet")); > 91 break; Change-Id: I9d563b6ad4ed70a891c583a82331dd80db5956dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133997 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/source/src/java/org/libreoffice/FormattingController.java index 4527583d503c..49cffabf72d8 100644 --- a/android/source/src/java/org/libreoffice/FormattingController.java +++ b/android/source/src/java/org/libreoffice/FormattingController.java @@ -84,70 +84,47 @@ class FormattingController implements View.OnClickListener { button.getBackground().setState(new int[]{android.R.attr.state_selected}); } -switch(button.getId()) { - -case R.id.button_insertFormatListBullets: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultBullet")); -break; - -case R.id.button_insertFormatListNumbering: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultNumbering")); -break; - -case R.id.button_bold: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Bold")); -break; -case R.id.button_italic: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Italic")); -break; -case R.id.button_strikethrough: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Strikeout")); -break; -case R.id.button_clearformatting: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:ResetAttributes")); -break; -case R.id.button_underlined: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:UnderlineDouble")); -break; -case R.id.button_align_left: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:LeftPara")); -break; -case R.id.button_align_center: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:CenterPara")); -break; -case R.id.button_align_right: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:RightPara")); -break; -case R.id.button_align_justify: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:JustifyPara")); -break; -case R.id.button_insert_line: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Line")); -break; -case R.id.button_insert_rect: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Rect")); -break; -case R.id.button_font_shrink: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Shrink")); -break; -case R.id.button_font_grow: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Grow")); -break; -case R.id.button_subscript: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:SubScript")); -break; -case R.id.button_superscript: -LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:SuperScript")); -break; -case R.id.button_insert_picture: -insertPicture(); -break; -case R.id.button_insert_table: -insertTable(); -break; -case R.id.button_delete_table: -deleteTable(); -break; +final int buttonId = button.getId(); +if (buttonId == R.id.button_insertFormatListBullets) { +LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultBullet")); +} else if (buttonId == R.id.button_insertFormatListNumbering) { +
[Libreoffice-commits] core.git: android/source
android/source/res/drawable/ic_auto_color.xml | 10 +++ android/source/res/layout/toolbar_color_picker.xml | 32 +--- android/source/res/values-de/strings.xml|1 android/source/res/values/strings.xml |1 android/source/src/java/org/libreoffice/FontController.java | 21 +-- 5 files changed, 52 insertions(+), 13 deletions(-) New commits: commit e1381521c59362053e70ebe1b0c52a1f0378 Author: Michael Weghorn AuthorDate: Sat May 7 21:25:14 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:27:05 2022 +0200 android: Allow setting auto font/bg color Add a button in the color palette UI (that can be found in the bottom toolbar under "Styles" -> "Font Color"/"Highlight Color" when experimental editing mode is enabled) which allows setting auto color for the font or the highlighting/background. This allows to unset any explicitly set color and use the automatic color. This is equivalent to the "Automatic"/"No fill color" items in the font color and character highlighting color popups in the desktop version. Add a `boolean keepAlpha` param to `sendFont{,Back}ColorChange` to be able to distinguish between "auto color" and white when -1/0x is passed as color. See also previous commit Change-Id I2e6512f32e671f92c8d31b2780c350dd74fb0747, "android: Handle auto color as such", for some more context. Change-Id: I05182a2adbc00e64b1925ff52861a51ba8dcc21f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133996 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/drawable/ic_auto_color.xml b/android/source/res/drawable/ic_auto_color.xml new file mode 100644 index ..3c68b556ee70 --- /dev/null +++ b/android/source/res/drawable/ic_auto_color.xml @@ -0,0 +1,10 @@ +http://schemas.android.com/apk/res/android; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24" +android:viewportHeight="24" +android:tint="?attr/colorControlNormal"> + + diff --git a/android/source/res/layout/toolbar_color_picker.xml b/android/source/res/layout/toolbar_color_picker.xml index e80f25bf46f6..6a8f81b2a842 100644 --- a/android/source/res/layout/toolbar_color_picker.xml +++ b/android/source/res/layout/toolbar_color_picker.xml @@ -21,13 +21,31 @@ android:layout_height="wrap_content" android:padding="10dp" android:orientation="vertical"> - + + + + + + + + Hervorhebungs-Farbe Schriftfarbe Folie umbenennen +Automatisch diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml index 49eea9f3014c..207be1c2c150 100644 --- a/android/source/res/values/strings.xml +++ b/android/source/res/values/strings.xml @@ -168,4 +168,5 @@ Highlight Color Font Color Rename Slide +Automatic diff --git a/android/source/src/java/org/libreoffice/FontController.java b/android/source/src/java/org/libreoffice/FontController.java index 2eb6b2f7f658..e0161076a5a1 100644 --- a/android/source/src/java/org/libreoffice/FontController.java +++ b/android/source/src/java/org/libreoffice/FontController.java @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; +import android.widget.Button; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -48,7 +49,7 @@ public class FontController implements AdapterView.OnItemSelectedListener { final ColorPaletteListener colorPaletteListener = new ColorPaletteListener() { @Override public void applyColor(int color) { -sendFontColorChange(color); +sendFontColorChange(color, false); } @Override @@ -70,7 +71,7 @@ public class FontController implements AdapterView.OnItemSelectedListener { final ColorPaletteListener backColorPaletteListener = new ColorPaletteListener() { @Override public void applyColor(int color) { -sendFontBackColorChange(color); +sendFontBackColorChange(color, false); } @Override @@ -141,12 +142,12 @@ public class FontController implements AdapterView.OnItemSelectedListener { } } -private void sendFontColorChange(int color){ +private void sendFontColorChange(int color, boolean keepAlpha){ try { JSONObject json = new JSONObject(); JSONObject valueJson = new JSONObject(); valueJson.put("type", "long"); -valueJson.put("value", 0x00FF & color); +valueJson.put("value", keepAlpha ? color : 0x00FF & color); json.put("Color", valueJson);
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ColorPickerAdapter.java |9 -- android/source/src/java/org/libreoffice/FontController.java | 45 ++ 2 files changed, 27 insertions(+), 27 deletions(-) New commits: commit 5c50d8f7ee351e7605b382ae5b06ccaa8518747f Author: Michael Weghorn AuthorDate: Sat May 7 19:23:12 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:25:36 2022 +0200 android: Handle auto color as such When no color is explicitly set for the font/background (i.e. automatic color is used which would e.g. be black for the font if no background color is set or white if a black highlight color is set in Writer), the value for the color sent in the ".uno:Color" event for the font color and similarly for the background/highlight color (".uno:BackgroundColor" in Calc, ".uno:CharBackColor" in Impress, ".uno:BackColor" in Writer) is -1. The previous handling of that special value was problematic: 1) Where handled specifically, -1 was interpreted as "black color" rather than "auto/no color". 2) The color handled by the above-mentioned UNO events does not contain/handle the alpha channel, while Android does, so a conversion happens to add/remove the alpha layer. However, the anonymous `ColorPaletteListener`s that handle font and background color updates in their `updateColorPickerPosition` methods were not doing a logical or to add an alpha channel to the LO-provided color, but *adding* 0xFF00 instead, which is the same for actual colors without an alpha channel set, but the actual special value of -1 (0x) would then be converted to 0xFEFF and no longer be treated as special. The way of treating -1 as black would also have the side effect that an explicit white color (0x00FF) would be converted to 0x, which is -1, and would therefore be treated as black. (So setting font color to white would result in black being shown as font color in the font color UI in experimental mode instead...) In order to actually handle auto color as such, handle the special value of -1 right in the `updateColorPickerPosition` methods: In that case, unselect any explicitly selected color (and set color to transparent for the buttons in the "Style" tab of the toolbar, `font_color_picker_button` and `font_back_color_picker_button` in `toolbar_bottom.xml`). Also, do a logical or to add the alpha layer instead of adding 0xFF00. While at it, unify the code in the two `updateColorPickerPosition` methods a bit. Change-Id: I2e6512f32e671f92c8d31b2780c350dd74fb0747 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133992 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java index dbbf65cf67b8..a17dd264fb99 100644 --- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java @@ -125,15 +125,6 @@ public class ColorPickerAdapter extends RecyclerView.Adapter
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ColorPickerAdapter.java | 35 ++ 1 file changed, 23 insertions(+), 12 deletions(-) New commits: commit bc762b702d9869070b05d63e14a39a758a21ad3e Author: Michael Weghorn AuthorDate: Sat May 7 18:05:40 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:24:20 2022 +0200 android: Don't show any color in palette as selected if none matches In Android Viewer with experimental editing mode enabled, doing the following resulted in black still being marked as the current font color in the "Style" -> "Font Color" UI. 1) create a new Writer doc in the desktop version with one paragraph that has the font color explicitly set to black and one with "Dark Brick 2" 2) open the doc in Android Viewer with experimental mode enabled 3) tap on the first paragraph with font color explicitly set to black 4) open the "Style" -> "Font Color" UI where the color could be changed (layout file: `toolbar_color_picker.xml`) -> black is marked as current font color (OK) 5) tap on the paragraph which has font color "Dark Brick 2" set -> black is still marked as current font color (NOK) This is because the indices of the previously set color would just remain set if the new color was not found in any of the palettes which contain a set of predefined colors. Change that to set the index for the `upperSelectedBox` palette to 0 (i.e. switch to the first palette), and the index of the `selectedBox` (i.e. color within the palette) to the special value of '-1' and don't mark any palette or color as selected in that case. The newly introduced `ColorPickerAdapter#unselectColors` will be used from elsewhere in a follow-up commit, so make it public right away. The two `ImageButton`s right in the "Style" tab in the toolbar (i.e. `font_color_picker_button` and `font_back_color_picker_button` in `toolbar_bottom.xml`) remain unchanged and keep showing the actual color, since those are not restricted to predefined colors in the palettes. For the case where no explicit font color is set (i.e. use of automatic font color, e.g. black if no background is set, but white if the background is set to black), the value '-1' is sent from the C++ side, and no color should be marked as selected in Android Viewer, which also works with this change in place in general. However, the current handling for the "automatic color" case on Android Viewer side looks suspicious in more ways that will be addressed in a follow-up commit. Change-Id: I228d57ace5341bd311761f40c477441d1e511d5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133989 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java index bae9c3ed7768..dbbf65cf67b8 100644 --- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java @@ -40,7 +40,8 @@ public class ColorPickerAdapter extends RecyclerView.Adapter= 0) { holder.colorBox.setImageResource(R.drawable.ic_done_white_12dp); } else { holder.colorBox.setImageDrawable(null); @@ -68,6 +69,15 @@ public class ColorPickerAdapter extends RecyclerView.Adapter
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ColorPickerAdapter.java | 24 +- 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 9a249103de13f2a00fc17bf138d3e656f9a311b8 Author: Michael Weghorn AuthorDate: Sat May 7 17:54:57 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:23:29 2022 +0200 android: Switch order of these if/else statements I find if (a == b) { // statement 1 } else { // statement 2 } more straightforward than if ( a != b) { // statement 2 } else { // statement 1 } since it doesn't require logically negating twice (else block is for `!(a != b)`) in the second form), and this also prepares for a follow-up commit where one of the conditions will be extended further. Change-Id: I1d2177bdcf662994e757b626983a9f9626c66aa1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133988 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java index ed8fe0e59933..bae9c3ed7768 100644 --- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java @@ -40,10 +40,10 @@ public class ColorPickerAdapter extends RecyclerView.Adapter= 0; k--) { red_shade = (int) (red_shade * 0.75); @@ -100,14 +108,6 @@ public class ColorPickerAdapter extends RecyclerView.Adapter
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ColorPaletteAdapter.java |4 android/source/src/java/org/libreoffice/ColorPickerAdapter.java |8 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 5c452ad4c31bcaa3f0a94c50b5eeb7cbca27da2e Author: Michael Weghorn AuthorDate: Sat May 7 17:44:56 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:22:26 2022 +0200 android: Don't store selected pos in ColorPickerAdapter The position is already set and used in `ColorPaletteAdapter` as its `upperSelectedBox` member, so stop doing the double bookkeeping in both classes and retrieve it from there instead. Change-Id: I59896b85f5d5a0285076f61599be64638fa71121 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133987 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java index e26dcc1c30a9..16d8a977864f 100644 --- a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java @@ -36,6 +36,10 @@ public class ColorPaletteAdapter extends RecyclerView.Adapter
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ColorPaletteAdapter.java | 12 +- android/source/src/java/org/libreoffice/ColorPickerAdapter.java | 12 +- 2 files changed, 12 insertions(+), 12 deletions(-) New commits: commit fd50cbbc410ebf949e00881de848bf90cb2f72aa Author: Michael Weghorn AuthorDate: Sat May 7 17:39:21 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:21:37 2022 +0200 android: Make Color{Palette,Picker}Adapter members private ... and make some `final` as well. Change-Id: Ib50ff32788edaea753cc25f119f91a93e936b2ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133986 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java index 41aed46ca915..e26dcc1c30a9 100644 --- a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java @@ -12,12 +12,12 @@ import android.widget.ImageButton; public class ColorPaletteAdapter extends RecyclerView.Adapter { -int[][] color_palette; -Context mContext; -int upperSelectedBox = -1; -int selectedBox = 0; -boolean animate; -ColorPaletteListener colorPaletteListener; +private int[][] color_palette; +private final Context mContext; +private int upperSelectedBox = -1; +private int selectedBox = 0; +private boolean animate; +private final ColorPaletteListener colorPaletteListener; public ColorPaletteAdapter(Context mContext, ColorPaletteListener colorPaletteListener) { this.mContext = mContext; diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java index 9b7e8173975c..b88087da3bf0 100644 --- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java @@ -12,12 +12,12 @@ import android.widget.ImageButton; public class ColorPickerAdapter extends RecyclerView.Adapter { -Context mContext; -ColorPaletteAdapter colorPaletteAdapter; -ColorPaletteListener colorPaletteListener; -int[] colorList; -int[][] colorPalette = new int[11][8]; -int selectedBox = 0; +private final Context mContext; +private final ColorPaletteAdapter colorPaletteAdapter; +private final ColorPaletteListener colorPaletteListener; +private final int[] colorList; +private final int[][] colorPalette = new int[11][8]; +private int selectedBox = 0; public ColorPickerAdapter(Context mContext, final ColorPaletteAdapter colorPaletteAdapter, ColorPaletteListener colorPaletteListener) { this.mContext = mContext;
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/FontController.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 87d0037d75386afcaef4002e2e652b95d6cd92d5 Author: Michael Weghorn AuthorDate: Fri May 6 22:27:51 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:21:04 2022 +0200 android: Drop explicit type arguments when calling ctors Addresses these suggestions shown in Android Studio: * "Explicit type argument String can be replaced with <>" * "Explicit type argument String, ArrayList can be replaced with <>" Change-Id: Ibc78364cf5b246d8c1e1d32d755c3e8dcf0e32aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133985 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/FontController.java b/android/source/src/java/org/libreoffice/FontController.java index 8b7f232ac65c..ab8ffe307363 100644 --- a/android/source/src/java/org/libreoffice/FontController.java +++ b/android/source/src/java/org/libreoffice/FontController.java @@ -26,9 +26,9 @@ public class FontController implements AdapterView.OnItemSelectedListener { private boolean mFontNameSpinnerSet = false; private boolean mFontSizeSpinnerSet = false; private final LibreOfficeMainActivity mActivity; -private final ArrayList mFontList = new ArrayList(); -private final ArrayList mFontSizes = new ArrayList(); -private final HashMap> mAllFontSizes = new HashMap>(); +private final ArrayList mFontList = new ArrayList<>(); +private final ArrayList mFontSizes = new ArrayList<>(); +private final HashMap> mAllFontSizes = new HashMap<>(); private String mCurrentFontSelected = null; private String mCurrentFontSizeSelected = null; @@ -213,7 +213,7 @@ public class FontController implements AdapterView.OnItemSelectedListener { String key = keys.next(); mFontList.add(key); JSONArray array = jObject2.getJSONArray(key); -fontSizes = new ArrayList(); +fontSizes = new ArrayList<>(); for (int i = 0; i < array.length(); i++) { fontSizes.add(array.getString(i)); } @@ -237,14 +237,14 @@ public class FontController implements AdapterView.OnItemSelectedListener { private void setupFontNameSpinner() { Spinner fontSpinner = mActivity.findViewById(R.id.font_name_spinner); -ArrayAdapter dataAdapter = new ArrayAdapter(mActivity, android.R.layout.simple_spinner_item, mFontList); +ArrayAdapter dataAdapter = new ArrayAdapter<>(mActivity, android.R.layout.simple_spinner_item, mFontList); dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); fontSpinner.setAdapter(dataAdapter); } private void setupFontSizeSpinner() { Spinner fontSizeSpinner = mActivity.findViewById(R.id.font_size_spinner); -ArrayAdapter dataAdapter = new ArrayAdapter(mActivity, android.R.layout.simple_spinner_item, mFontSizes); +ArrayAdapter dataAdapter = new ArrayAdapter<>(mActivity, android.R.layout.simple_spinner_item, mFontSizes); dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); fontSizeSpinner.setAdapter(dataAdapter); }
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ColorPickerAdapter.java |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 621db9bfacca199ea1db1abf1a4b57f72fb8c8fa Author: Michael Weghorn AuthorDate: Fri May 6 22:15:19 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:20:22 2022 +0200 android: Move assignment to existing loop There is already a loop just before this one, so just move that assignment there as well. Change-Id: Ie93a0275c0940b7932973264352bad64d0489b03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133984 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java index d81d43c77fbc..9b7e8173975c 100644 --- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java @@ -111,9 +111,7 @@ public class ColorPickerAdapter extends RecyclerView.Adapter
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ColorPickerAdapter.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c2d7e23861861c13644f1c9e3dc4e4356912f71 Author: Michael Weghorn AuthorDate: Fri May 6 22:14:35 2022 +0200 Commit: Michael Weghorn CommitDate: Sun May 8 08:19:23 2022 +0200 android: Use existing Color.WHITE constant ... instead of creating the color from the RGB values manually. Change-Id: I2058de553e2e70e7d856ca9bfaf5f9041b49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133983 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java index 89b9b9044033..d81d43c77fbc 100644 --- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java @@ -113,7 +113,7 @@ public class ColorPickerAdapter extends RecyclerView.Adapter
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7250d61c28a9467fa17736717b409cefd50867d3 Author: Michael Weghorn AuthorDate: Wed May 4 07:29:11 2022 +0200 Commit: Michael Weghorn CommitDate: Wed May 4 13:34:40 2022 +0200 android: Don't use log tag longer than 23 chars Addresses this lint error: > .../android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java:146: > Error: The logging tag can be at most 23 characters, was 31 > (GeckoSimpleScaleGestureDetector) [LongLogTag] > Log.e(LOGTAG, "No gesture taking place in getFocusX()!"); Change-Id: I1d18fb3717ccea8dc36695bfef888d035efe8d55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133799 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java b/android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java index 1d901a02a14b..e89015b5ed8c 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java @@ -34,7 +34,7 @@ import java.util.Stack; * - It doesn't take pressure into account, which results in smoother scaling. */ public class SimpleScaleGestureDetector { -private static final String LOGTAG = "GeckoSimpleScaleGestureDetector"; +private static final String LOGTAG = "ScaleGestureDetector"; private SimpleScaleGestureListener mListener; private long mLastEventTime;
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/FileUtilities.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b463cbc22d00f40055983c213c505c60064289a Author: Michael Weghorn AuthorDate: Wed May 4 07:17:01 2022 +0200 Commit: Michael Weghorn CommitDate: Wed May 4 13:34:09 2022 +0200 android: Make clear that column index is non-negative Use `Cursor#getColumnIndexOrThrow` instead of `Cursor#getColumnIndex` here, as suggested in the `Cursor#getColumnIndex` doc [1]: > Returns the zero-based index for the given column name, or -1 if the > column doesn't exist. If you expect the column to exist use > getColumnIndexOrThrow(java.lang.String) instead, which will make the > error more clear. As described in the `OpenableColumns` doc [2], `OpenableColumns.DISPLAY_NAME` is one of the two standard columns that must be supported: > These are standard columns for openable URIs. Providers that serve > openable URIs must support at least these columns when queried. Addresses this lint error: > .../android/source/src/java/org/libreoffice/ui/FileUtilities.java:139: Error: Value must be ≥ 0 [Range] > displayName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)); > ~~~ > >Explanation for issues of type "Range": >Some parameters are required to in a particular numerical range; this check >makes sure that arguments passed fall within the range. For arrays, Strings >and collections this refers to the size or length. [1] https://developer.android.com/reference/android/database/Cursor#getColumnIndex(java.lang.String) [2] https://developer.android.com/reference/android/provider/OpenableColumns Change-Id: I946fcd32a905a4bb8c0527fc1199b9dcc52bccfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133798 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index 52b92534947f..902b30ed7794 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java @@ -136,7 +136,7 @@ public class FileUtilities { String[] columns = {OpenableColumns.DISPLAY_NAME}; cursor = resolver.query(docUri, columns, null, null, null); if (cursor != null && cursor.moveToFirst()) { -displayName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)); +displayName = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)); } } catch (SecurityException e) { // thrown e.g. when Uri has become invalid, e.g. corresponding file has been deleted
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |1 + android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |1 + 2 files changed, 2 insertions(+) New commits: commit 4fb2a667a634d04cbb72f005e7a74b4f29af0f81 Author: Michael Weghorn AuthorDate: Wed May 4 07:07:39 2022 +0200 Commit: Michael Weghorn CommitDate: Wed May 4 13:33:23 2022 +0200 android: Call base class implementation in 'onActivityResult' Addresses this lint error: > android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java:253: Error: > Overriding method should call super.onActivityResult [MissingSuperCall] > protected void onActivityResult(int requestCode, int resultCode, Intent data) { > > >Explanation for issues of type "MissingSuperCall": >Some methods, such as View#onDetachedFromWindow, require that you also call >the super implementation as part of your method. Change-Id: Iab2bdadae7a776e4f52d671a6fd47c1b8146b2a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133797 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index dec1cb3649c2..a44ec56e2457 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -1104,6 +1104,7 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { +super.onActivityResult(requestCode, resultCode, data); if (requestCode == REQUEST_CODE_SAVEAS && resultCode == RESULT_OK) { final Uri fileUri = data.getData(); saveDocumentAs(fileUri); diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index e7b38b4cac86..a5fa78f22404 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -251,6 +251,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { +super.onActivityResult(requestCode, resultCode, data); if (requestCode == REQUEST_CODE_OPEN_FILECHOOSER && resultCode == RESULT_OK) { final Uri fileUri = data.getData(); openDocument(fileUri);
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/FileUtilities.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c50afd45d2f6a7c70bb3a7591747b162a2675311 Author: Michael Weghorn AuthorDate: Fri Apr 29 22:01:07 2022 +0200 Commit: Michael Weghorn CommitDate: Sat Apr 30 07:11:04 2022 +0200 android: Show Impress icon for .pps files For some reason, that was commented out. Opening such a PowerPoint file worked just fine, and with this commit in place, the Impress icon is shown in the "Recent Files" view as well. Change-Id: I69bce54074c084928d9aa7b95f37145a9692b847 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133649 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index 4675ca1d0709..52b92534947f 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java @@ -63,7 +63,7 @@ public class FileUtilities { mExtnMap.put(".vsdx", DRAWING); mExtnMap.put(".pub", DRAWING); mExtnMap.put(".ppt", IMPRESS); -// mExtnMap.put(".pps", IMPRESS); +mExtnMap.put(".pps", IMPRESS); mExtnMap.put(".xls", CALC); // MS templates
[Libreoffice-commits] core.git: android/source
android/source/AndroidManifest.xml|2 +- android/source/src/java/org/libreoffice/ui/FileUtilities.java |2 +- android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |1 + 3 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 965205931162b7fcdc175672354103b40985c6ed Author: Michael Weghorn AuthorDate: Fri Apr 29 21:55:54 2022 +0200 Commit: Michael Weghorn CommitDate: Sat Apr 30 07:10:35 2022 +0200 tdf#111427 android: Enable support for .ppsx Opening the sample file of MIME type "application/vnd.openxmlformats-officedocument.presentationml.slideshow" attached to tdf#111427 worked fine now when testing in an x86_64 AVD with API level 31, so declare support for it. Change-Id: I67ace0fb6ee82c0a43624dc32671ba2d453e473c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133648 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index 0af368c8460b..c50ad77ae71d 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -70,7 +70,7 @@ - + diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index 72da47b8cc3a..4675ca1d0709 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java @@ -74,7 +74,7 @@ public class FileUtilities { // OOXML mExtnMap.put(".docx", DOC); mExtnMap.put(".pptx", IMPRESS); -// mExtnMap.put(".ppsx", IMPRESS); +mExtnMap.put(".ppsx", IMPRESS); mExtnMap.put(".xlsx", CALC); // OOXML templates diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 965639e6e2ba..e7b38b4cac86 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -103,6 +103,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings "application/x-mspublisher", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "application/vnd.openxmlformats-officedocument.presentationml.presentation", + "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "application/vnd.openxmlformats-officedocument.wordprocessingml.template", "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LOKitTileProvider.java |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 5453f75a1e682992f3a725781bb563b8cc76cf1b Author: Michael Weghorn AuthorDate: Tue Apr 26 16:43:15 2022 +0200 Commit: Michael Weghorn CommitDate: Wed Apr 27 05:51:32 2022 +0200 android: Slightly clean up style of LOKitTileProvider#resetParts * Reduce scope of the `parts` variable to the if block * add an emptly line before the next method Change-Id: I22389cb4c9307f6888c4ed836056caf23ce84da6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133450 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/LOKitTileProvider.java b/android/source/src/java/org/libreoffice/LOKitTileProvider.java index fa22bc803c9a..0c7931763571 100644 --- a/android/source/src/java/org/libreoffice/LOKitTileProvider.java +++ b/android/source/src/java/org/libreoffice/LOKitTileProvider.java @@ -176,9 +176,9 @@ class LOKitTileProvider implements TileProvider { } public void resetParts(){ -int parts = mDocument.getParts(); mContext.getDocumentPartView().clear(); if (mDocument.getDocumentType() != Document.DOCTYPE_TEXT) { +int parts = mDocument.getParts(); for (int i = 0; i < parts; i++) { String partName = mDocument.getPartName(i); @@ -192,7 +192,9 @@ class LOKitTileProvider implements TileProvider { mContext.getDocumentPartView().add(partView); } } -} public void renamePart(String partName) { +} + +public void renamePart(String partName) { try{ for(int i=0; i
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit b68821acc77c774c09ebca8be157a768ea417e04 Author: Michael Weghorn AuthorDate: Thu Apr 21 17:01:55 2022 +0200 Commit: Michael Weghorn CommitDate: Thu Apr 21 21:01:37 2022 +0200 android: Show file chooser despite package visibility filtering in API 30 While it was working just fine in my x86_64 AVD with API level 31, opening the the file chooser on a real HW aarch64 device running Android 12 no longer worked by tapping on the TextView in `LibreOfficeUIActivity` after updating target API from 28 to 31 in commit 2ab389b251744fa7f3f6b060c09746e59d87f3b1 Date: Tue Apr 19 10:33:27 2022 +0200 android: Update compileSdkVersion/targetSdkVersion to 31 The intent.resolveActivity(getPackageManager()) != null check was failing there, so the Activity with `Intent.ACTION_OPEN_DOCUMENT` wasn't started there. This looks like an issue due to package visibility filtering introduced in target API level 30. Quoting from [1]: > When an app targets Android 11 (API level 30) or higher and queries for > information about the other apps that are installed on a device, the > system filters this information by default. The limited package > visibility reduces the number of apps that appear to be installed on a > device, from your app's perspective. > > [...] > > The limited app visibility affects the return results of methods that > give information about other apps, such as queryIntentActivities(), > getPackageInfo(), and getInstalledApplications(). The limited > visibility also affects explicit interactions with other apps, such > as starting another app's service. From how I understand it, the check is used to make sure that there is an app that can handle the Intent, as e.g. the "Android fundamentals 02.3: Implicit intents" tutorial [2] mentions it for the example using an `Intent.ACTION_VIEW`: > Use the resolveActivity() method and the Android package manager to find > an Activity that can handle your implicit Intent. Make sure that the > request resolved successfully. > > if (intent.resolveActivity(getPackageManager()) != null) { > } > > This request matches your Intent action and data with the Intent filters > for installed apps on the device. You use it to make sure there is at > least one Activity that can handle your requests. While that sounds reasonable to make sure there is an app that can view specific data passed *from* the app (and [3] describes how to add a corresponding `` element to make this use case work), it seems to be unnecessary for `Intent.ACTION_OPEN_DOCUMENT`, since that causes the system to "display the various DocumentsProvider instances installed on the device, letting the user navigate through them" and Android presumably at least provides a provider for handling local files by itself in any case. The `Intent.ACTION_GET_CONTENT` case used instead of `Intent.ACTION_OPEN_DOCUMENT` for API level < 19 should presumably be similar. Anyway, in case there should still be any case where the Intent cannot be handled: `startActivityForResult` "throws ActivityNotFoundException if there was no Activity found to run the given Intent." [4], so add a try-catch block handling that exception instead of the previous check. [1] https://developer.android.com/training/package-visibility [2] https://developer.android.com/codelabs/android-training-activity-with-implicit-intent?index=..%2F..android-training#3 [3] https://developer.android.com/training/package-visibility/use-cases#open-a-file [4] https://developer.android.com/reference/android/app/Activity#startActivityForResult(android.content.Intent,%20int) Change-Id: I7702b100d71333be2d78df1bc81ef2e5a7e016bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133272 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 16e0fe8af2cd..965639e6e2ba 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -10,6 +10,7 @@ package org.libreoffice.ui; import android.Manifest; +import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -268,8 +269,10 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings intent.setType("*/*");
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit b68362b178f732f90fdc99073aaa5940bee409bb Author: Michael Weghorn AuthorDate: Thu Apr 21 16:34:03 2022 +0200 Commit: Michael Weghorn CommitDate: Thu Apr 21 21:01:05 2022 +0200 android: Slightly improve style in use of arrays Addresses these warnings shown in Android Studio for class `LibreOfficeUIActivity`: * "Unnecessary 'Arrays.asList()' call" * "Raw use of parameterized class 'ArrayList'" * "Explicit type argument ShortcutInfo can be replaced with <>" Change-Id: I083e5fcf804209fae704b19643ce80bc92126ca8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133271 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 1f7292b2a538..16e0fe8af2cd 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -197,9 +197,9 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings SharedPreferences prefs = getSharedPreferences(EXPLORER_PREFS_KEY, MODE_PRIVATE); String recentPref = prefs.getString(RECENT_DOCUMENTS_KEY, ""); -List recentFileStrings = Arrays.asList(recentPref.split(RECENT_DOCUMENTS_DELIMITER)); +String[] recentFileStrings = recentPref.split(RECENT_DOCUMENTS_DELIMITER); -final List recentFiles = new ArrayList(); +final List recentFiles = new ArrayList<>(); for (String recentFileString : recentFileStrings) { Uri uri = Uri.parse(recentFileString); String filename = FileUtilities.retrieveDisplayNameForDocumentUri(getContentResolver(), uri); @@ -364,7 +364,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings getContentResolver().takePersistableUriPermission(fileUri, Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); String newRecent = fileUri.toString(); -List recentsList = new ArrayList(Arrays.asList(prefs.getString(RECENT_DOCUMENTS_KEY, "").split(RECENT_DOCUMENTS_DELIMITER))); +List recentsList = new ArrayList<>(Arrays.asList(prefs.getString(RECENT_DOCUMENTS_KEY, "").split(RECENT_DOCUMENTS_DELIMITER))); // remove string if present, so that it doesn't appear multiple times recentsList.remove(newRecent); @@ -393,7 +393,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings //Remove all shortcuts, and apply new ones. shortcutManager.removeAllDynamicShortcuts(); -ArrayList shortcuts = new ArrayList(); +ArrayList shortcuts = new ArrayList<>(); for (String recentDoc : recentsList) { Uri docUri = Uri.parse(recentDoc); String filename = FileUtilities.retrieveDisplayNameForDocumentUri(getContentResolver(), docUri);
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 6515633aad867dd9e2d59378f3254e292dbdacb0 Author: Michael Weghorn AuthorDate: Thu Apr 21 15:54:55 2022 +0200 Commit: Michael Weghorn CommitDate: Thu Apr 21 21:00:29 2022 +0200 android: Drop unused import and extra semicolon Change-Id: I19557b0b1d63698a31dac61ce9fde3ce07f86451 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133267 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 3b7b401804b8..1f7292b2a538 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -10,7 +10,6 @@ package org.libreoffice.ui; import android.Manifest; -import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -267,7 +266,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings } intent.setType("*/*"); -intent.putExtra(Intent.EXTRA_MIME_TYPES, SUPPORTED_MIME_TYPES);; +intent.putExtra(Intent.EXTRA_MIME_TYPES, SUPPORTED_MIME_TYPES); if (intent.resolveActivity(getPackageManager()) != null) { startActivityForResult(intent, REQUEST_CODE_OPEN_FILECHOOSER);