android/source/build.gradle | 2 +- android/source/res/drawable-hdpi/ic_keyboard.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit ca931f4762eb7a47802270689b665b472908740d Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jan 10 10:54:20 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Jan 15 11:15:17 2024 +0100 android: Update com.google.android.material:material to 1.11.0 Change-Id: Ic0f84c275e8780bd2c3da42cb5387587a4e26833 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161883 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/build.gradle b/android/source/build.gradle index 69c7785c0179..090d73f49bfb 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.10.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.multidex:multidex:2.0.1" } commit c0a10888ab966b34cea1bf9a079725f89f133dcd Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jan 10 13:13:39 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Jan 15 11:15:09 2024 +0100 android: Avoid icon name clash with material library Rename the file for the keyboard icon from `ic_keyboard_black_24dp.png` to `ic_keyboard_black__24dp.png` (note the extra underscore) to avoid a name clash with an icon of the same name in the Material components: [1] Keeping the same name would result in this lint error when upgrading to material 1.11.0 (which an upcoming commit will do): > 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/res/drawable-hdpi/ic_keyboard.xml:4: Error: The resource @drawable/ic_keyboard_black_24dp is marked as private in com.google.android.material:material:1.11.0 [PrivateResource] android:src="@drawable/ic_keyboard_black_24dp" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Explanation for issues of type "PrivateResource": Private resources should not be referenced; the may not be present everywhere, and even where they are they may disappear without notice. To fix this, copy the resource into your own project instead. 1 errors, 0 warnings (213 errors, 1 warning filtered by baseline lint-baseline.xml) (For the currently-used material 1.10.0, this warning was previously ignored since it's already listed in the lint-baseline.xml file, but that doesn't apply any more after an update.) [1] https://github.com/material-components/material-components-android/blob/bb351291a360319df31d5cee27e091c3e64f65a4/lib/java/com/google/android/material/timepicker/res/drawable/ic_keyboard_black_24dp.xml Change-Id: I2babc445c69f1043967118be81905c334a0285d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161889 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/res/drawable-hdpi/ic_keyboard.xml b/android/source/res/drawable-hdpi/ic_keyboard.xml index 00902169d505..2aea0f7597a7 100644 --- a/android/source/res/drawable-hdpi/ic_keyboard.xml +++ b/android/source/res/drawable-hdpi/ic_keyboard.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android"; - android:src="@drawable/ic_keyboard_black_24dp" - android:tint="@color/toolbar_foreground"/> \ No newline at end of file + android:src="@drawable/ic_keyboard_black__24dp" + android:tint="@color/toolbar_foreground"/> diff --git a/android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_keyboard_black__24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png rename to android/source/res/drawable-xxxhdpi/ic_keyboard_black__24dp.png
