diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-12-06 14:49:44 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-12-06 15:46:04 +0100 |
| commit | 1c8a31b33ed5813f99a86c2671a4cb04a9a099b9 (patch) | |
| tree | ebaecb0a7eedf3ee40bea42f6f6452bebe04cd72 /android | |
| parent | 99a6839cb2b7a4daaa07ad5d629a1f29849cb9fb (diff) | |
android: Brand also the shell's About dialog.
Change-Id: I63b668ad92c688ec69818c058a787dbd94b5cc8b
Reviewed-on: https://gerrit.libreoffice.org/84630
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/appSettings.gradle.in | 1 | ||||
| -rw-r--r-- | android/app/build.gradle | 2 | ||||
| -rw-r--r-- | android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/android/app/appSettings.gradle.in b/android/app/appSettings.gradle.in index e1f9662bc..4ce26c221 100644 --- a/android/app/appSettings.gradle.in +++ b/android/app/appSettings.gradle.in @@ -5,6 +5,7 @@ ext { liboVendor = '@VENDOR@' liboInfoURL = '@INFO_URL@' liboLauncherIcon = '@mipmap/@APP_IC_LAUNCHER@' + liboHasBranding = '@APP_HAS_BRANDING@' } android.defaultConfig { applicationId '@ANDROID_PACKAGE_NAME@' diff --git a/android/app/build.gradle b/android/app/build.gradle index 80fe4a55a..98ace7fb8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -16,6 +16,7 @@ android { resValue "string", "vendor", "${liboVendor}" resValue "string", "info_url", "${liboInfoURL}" manifestPlaceholders = [ appIcon: "${liboLauncherIcon}" ] + buildConfigField "boolean", "APP_HAS_BRANDING", "${liboHasBranding}" ndk { //abiFilters "x86", "armeabi-v7a", "armeabi" abiFilters "armeabi-v7a" @@ -29,6 +30,7 @@ android { resValue "string", "vendor", "${liboVendor}" resValue "string", "info_url", "${liboInfoURL}" manifestPlaceholders = [ appIcon: "${liboLauncherIcon}" ] + buildConfigField "boolean", "APP_HAS_BRANDING", "${liboHasBranding}" ndk { abiFilters "armeabi-v7a" } diff --git a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java index 3875674cf..89fd32e74 100644 --- a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java +++ b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java @@ -82,7 +82,7 @@ public class AboutDialogFragment extends DialogFragment { vendorView.setText(vendor); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder .setIcon(R.drawable.lo_icon) + builder .setIcon(BuildConfig.APP_HAS_BRANDING? R.drawable.ic_launcher_brand: R.drawable.lo_icon) .setTitle(R.string.app_name) .setView(messageView) .setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() { |