[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 android/app/build.gradle                    |    2 ++
 android/app/liboSettings.gradle.in          |    1 +
 android/app/src/main/res/values/strings.xml |    2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6746ef981db799785f957b01fd00896b7d468ae2
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Apr 12 18:05:31 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Apr 12 18:06:16 2019 +0200

    android: Allow setting of the app name via --with-app-name too.
    
    Change-Id: I8c8da8b4872724daf72841f2bf36fdff9ac53df6

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b972d243e..77abf7675 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -14,6 +14,7 @@ android {
     }
     buildTypes {
         debug {
+            resValue "string", "app_name", "${liboAppName}"
             ndk {
                 //abiFilters "x86", "armeabi-v7a", "armeabi"
                 abiFilters "armeabi-v7a"
@@ -21,6 +22,7 @@ android {
             debuggable true
         }
         release {
+            resValue "string", "app_name", "${liboAppName}"
             ndk {
                 abiFilters "armeabi-v7a"
             }
diff --git a/android/app/liboSettings.gradle.in b/android/app/liboSettings.gradle.in
index 325b9b933..42cccfe81 100644
--- a/android/app/liboSettings.gradle.in
+++ b/android/app/liboSettings.gradle.in
@@ -11,6 +11,7 @@ ext {
     liboVersionMajor    = '@LOOLWSD_VERSION_MAJOR@'
     liboVersionMinor    = '@LOOLWSD_VERSION_MAJOR@'
     liboGitFullCommit   = '@LOOLWSD_VERSION_HASH@'
+    liboAppName         = '@APP_NAME@'
 }
 android.defaultConfig {
     applicationId 'org.libreoffice.androidapp'
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 2eba35f54..fb98b77cb 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">OnlineApp</string>
+    <!--string name="app_name" definition is deliberately missing here, it is filled in in build.gradle.-->
 
     <string name="app_version">Version: %1$s\nBuild ID: %2$s</string>
     <string name="app_description">LibreOffice Viewer is a document viewer based on LibreOffice.</string>