android/app/build.gradle | 6 ++++++
android/app/src/main/res/layout/navigation_header.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 972a5387fb780f125584601bcc10ec97ccf67a84
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Apr 13 15:28:13 2020 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Mon Apr 20 23:45:38 2020 +0200
android: fix drawer_header_brand not found
./gradlew assemble
Execution failed for task ':app:processDebugResources'.
> A failure occurred while executing
com.android.build.gradle.internal.tasks.Workers$ActionFacade
> Android resource linking failed
android/app/src/main/res/layout/navigation_header.xml:8:
AAPT: error: resource drawable/drawer_header_brand
(aka org.libreoffice.androidapp.debug:drawable/drawer_header_brand) not
found.
Change-Id: I0776e495b6215129202ca583306ed32a8ac51bd4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92128
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Henry Castro <hcas...@collabora.com>
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0ac10b9f6..07f6aa41e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -21,6 +21,7 @@ android {
resValue "string", "app_name", "${liboAppName} Debug"
resValue "string", "vendor", "${liboVendor}"
resValue "string", "info_url", "${liboInfoURL}"
+ resValue "string", "image_draw_header", "@drawable/drawer_header"
manifestPlaceholders = [ appIcon: "${liboLauncherIcon}" ]
buildConfigField "boolean", "APP_HAS_BRANDING",
"${liboHasBranding}"
ndk {
@@ -35,6 +36,11 @@ android {
resValue "string", "app_name", "${liboAppName}"
resValue "string", "vendor", "${liboVendor}"
resValue "string", "info_url", "${liboInfoURL}"
+ if
(file("src/main/res/drawable/drawer_header_brand.png").exists()) {
+ resValue "string", "image_draw_header",
"@drawable/drawer_header_brand"
+ } else {
+ resValue "string", "image_draw_header",
"@drawable/drawer_header"
+ }
manifestPlaceholders = [ appIcon: "${liboLauncherIcon}" ]
buildConfigField "boolean", "APP_HAS_BRANDING",
"${liboHasBranding}"
ndk {
diff --git a/android/app/src/main/res/layout/navigation_header.xml
b/android/app/src/main/res/layout/navigation_header.xml
index 79889c36b..2b596bb5b 100644
--- a/android/app/src/main/res/layout/navigation_header.xml
+++ b/android/app/src/main/res/layout/navigation_header.xml
@@ -9,6 +9,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:src="@drawable/drawer_header_brand"/>
+ android:src="@string/image_draw_header"/>
</LinearLayout>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
