android/source/AndroidManifest.xml | 2 -- android/source/build.gradle | 2 +- android/source/res/layout/activity_main.xml | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit cebf1b118788ee080e3888115abbeb2e42a7fd15 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 29 12:07:20 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 30 12:17:37 2023 +0100 android: Use 'compileSdk' instead of deprecated 'compileSdkVersion' See [1] and [2]. From what I can see, they are equivalent for our use. This addresses a "'compileSdkVersion' is deprectaed." warning shown in Android Studio. [1] https://developer.android.com/reference/tools/gradle-api/7.0/com/android/build/api/dsl/CommonExtension#compilesdk [2] https://developer.android.com/reference/tools/gradle-api/7.0/com/android/build/api/dsl/CommonExtension#compilesdkversion Change-Id: I9a7416d8b3750a5f8f8281c6e226fc7bbe665776 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160084 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/build.gradle b/android/source/build.gradle index 1ae292ba1006..e623c9305e2b 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -39,7 +39,7 @@ dependencies { android { namespace 'org.libreoffice' - compileSdkVersion 33 + compileSdk 33 // uses non-conventional source layout, so need to reconfigure accordingly // ToDo move to conventional layout, so stuff can be stripped down. sourceSets { commit c33c375b90ac6ec4d0d339486ac779d6d7b441e5 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 29 11:34:39 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 30 12:17:30 2023 +0100 android: No longer extract native libs As described in more detail in commit 45fbfbfeae1de12e87d0a3748e22553b69adbc4a Author: Michael Weghorn <[email protected]> Date: Fri Mar 27 17:04:37 2020 +0100 tdf#131622 android: Extract native libs again , extracting native libraries was necessary for the NSS library to be able to load modules like `libnssckbi.so` at runtime. Without this, opening password-protected files would fail. However, this has in the meanwhile been addressed differently in the following commit (probably in the context of the online-based/Collabora Online app), so extracting libs is no longer needed: commit 16a7f98f99d334ea865b800e0b32d6fed1483942 Author: Mert Tumer <[email protected]> Date: Wed Sep 30 17:14:59 2020 +0300 Fix libnssckbi not found error on Android This error causes Android App to be unable to open Password-protected documents. Change-Id: Iacbacb1c780025752e2447db325b075c58947818 Signed-off-by: Mert Tumer <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103658 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> Therefore, no longer extract the libraries, which also addresses addresses this warning shown during the build: > Task :processStrippedUIEditingDebugMainManifest .../android/source/AndroidManifest.xml:16:9-41 Warning: android:extractNativeLibs should not be specified in this source AndroidManifest.xml file. See https://d.android.com/guide/topics/manifest/application-element#extractNativeLibs for more information. The AGP Upgrade Assistant can remove the attribute from the AndroidManifest.xml file and update the build file accordingly. See https://d.android.com/studio/build/agp-upgrade-assistant for more information. Change-Id: I867beea0bce8398806375048e87a152e1348d016 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160079 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index 9d1d309d7c9b..0a11a1d3654b 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -9,11 +9,9 @@ <uses-feature android:name="android.hardware.camera" android:required="false"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> - <!-- extractNativeLibs="true" needed e.g. for NSS to load modules at runtime --> <application android:name=".LibreOfficeApplication" android:allowBackup="true" - android:extractNativeLibs="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/LibreOfficeTheme" commit fa1f867caca9e5c6c0dbd4bcaf096f27077f363d Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 29 10:53:45 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 30 12:17:22 2023 +0100 tdf#124480 android: Set bg color for calc formula bar For the layout containing the Calc address/formula bar, explicitly set a background color that matches the theme. Otherwise, those text views would be using white font on white background when using dark theme, making the text unreadable. Change-Id: I5fdf9e04f8bb331ca6a57bf3046a7ebb9ccb0d1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160078 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml index 590a7de025b4..e503cb90f0eb 100644 --- a/android/source/res/layout/activity_main.xml +++ b/android/source/res/layout/activity_main.xml @@ -36,7 +36,8 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:background="@color/background_floating"> <EditText android:id="@+id/calc_address"
