[Libreoffice-commits] core.git: 3 commits - android/source

[Christian Lohmaier]

 android/source/AndroidManifest.xml           |    3 ++-
 android/source/build.gradle                  |    8 ++++++--
 android/source/res/layout/toolbar_bottom.xml |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 66518ead516e90d606e87c6ce58ec11fea6d172e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Aug 31 11:50:51 2017 +0200

    use extractNativeLibs="false" for less disk usage and faster installation
    
    no need to extract the (huge) nativve lib to the device's filesystem on
    newer android versions (Marshmallow and later) - can access the .so from
    within the apk if it is uncompressed.
    While the standalone apk will be larger, the delta-update mechanism of
    playstore can be more efficient, so you get:
    * faster installation (since the file doesn't need to be extracted)
    * less disk usage on device (for same reason)
    * smaller delta-updates for playstore
    
    drawbacks
    * larger standalone apk
    * on older android version more storage needed (the increased size of
    the standalone apk), as those will still extract the native-lib
    
    Unfortunately uncompressed it exceeds the current maximum size for
    single apk files in playstore (100MB), so cannot use for release-builds
    
    also revive installLocation attribute to allow installation on external
    storage and move from manifestPlaceholders from defaultConfig to release
    buildType (as otherwise gradle complains about having "Multiple entries
    with same key")
    
    Change-Id: Id07ac9c144886bb89abaf7b5b4bc7bd548f27247

diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml
index 037363163041..54ab1d4ba7c0 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -12,7 +12,9 @@
     <application
         android:name=".LibreOfficeApplication"
         android:allowBackup="true"
+        android:extractNativeLibs="${extractNativeLibs}"
         android:icon="@mipmap/ic_launcher"
+        android:installLocation="${installLocation}"
         android:label="@string/app_name"
         android:theme="@style/LibreOfficeTheme"
         android:debuggable="true"
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 92c6680f464a..1421f000de23 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -64,7 +64,6 @@ android {
         // 22 treats them as warnings, on 23 it is fatal error
         // ToDo: fix openssl stuff to not block targeting 23 or later
         targetSdkVersion 22
-        manifestPlaceholders = [installLocation: "preferExternal"]
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -72,7 +71,12 @@ android {
             // make android studio happy...
             jniDebuggable true
             // would work just fine with external, but setting emulator up is a little more work
-            manifestPlaceholders = [installLocation: "internalOnly"]
+            manifestPlaceholders = [installLocation: "auto", extractNativeLibs: "false"]
+        }
+        release {
+            // need to extract native libs (allow to compress them in apk), since otherwise would
+            // exceed maximum size for playstore
+            manifestPlaceholders = [installLocation: "preferExternal", extractNativeLibs: "true"]
         }
     }
     productFlavors {
commit e19100212c41f1b992f6e893ba525612e652d0c5
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Aug 30 22:27:33 2017 +0200

    android: use sp (instead of dp) for font-size
    
    Change-Id: I11dbf24b38c08b4dfd3cc64dbacbcd949a37b833

diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml
index 5e172f620314..1b4730d89adf 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -180,7 +180,7 @@
                                         android:text="Font Color"
                                         android:paddingBottom="12dp"
                                         android:paddingTop="12dp"
-                                        android:textSize="14dp"
+                                        android:textSize="14sp"
                                         android:gravity="center_vertical"
                                         android:textColor="@color/fontBlack"
                                         android:layout_alignParentLeft="true"
commit 6f29e5cb30d6244089f7f8b350bf61daea2c6fda
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Aug 28 20:15:27 2017 +0200

    min and target SdkVersions are taken from gradle
    
    Change-Id: I2eeb265b101b126f6bf268c9c5fa0195a44b0ce7

diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml
index 44fef292f151..037363163041 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -6,7 +6,6 @@
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
     <!-- App wants to know if device supports USB host capability(not mandatory) -->
     <uses-feature android:name="android.hardware.usb.host" android:required="false"/>
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET" />