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

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Sat Nov 26 15:23:58 UTC 2016


 android/source/AndroidManifest.xml                |    2 +-
 android/source/ic_launcher-web.png                |binary
 android/source/res/mipmap-hdpi/ic_launcher.png    |binary
 android/source/res/mipmap-mdpi/ic_launcher.png    |binary
 android/source/res/mipmap-xhdpi/ic_launcher.png   |binary
 android/source/res/mipmap-xxhdpi/ic_launcher.png  |binary
 android/source/res/mipmap-xxxhdpi/ic_launcher.png |binary
 dev/null                                          |binary
 8 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e40a2670d1a0146d523ba65a9d9ceecceb8c78c4
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Nov 25 16:05:26 2016 +0100

    android: launcher icon should be mipmap, not drawable
    
    as non-native mipmap resolutions don't get stripped from the apk (as
    drawables would), but launchers and similar might still want to show the
    higher-res version instead. Google Play store now enforces this.
    Also rename to the common name for it ("ic_launcher" instead of "main")
    
    Change-Id: I97318287f05556f5db0afaa0b23c0d8c9628465e
    Reviewed-on: https://gerrit.libreoffice.org/31204
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml
index d9d8e1e..2c395c1 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -10,7 +10,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/main"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:debuggable="true"
         android:hardwareAccelerated="true"
diff --git a/android/source/ic_launcher-web.png b/android/source/ic_launcher-web.png
new file mode 100644
index 0000000..e9dcfca
Binary files /dev/null and b/android/source/ic_launcher-web.png differ
diff --git a/android/source/res/drawable-hdpi/main.png b/android/source/res/drawable-hdpi/main.png
deleted file mode 100644
index 99c826d..0000000
Binary files a/android/source/res/drawable-hdpi/main.png and /dev/null differ
diff --git a/android/source/res/mipmap-hdpi/ic_launcher.png b/android/source/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..f8b7455
Binary files /dev/null and b/android/source/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-mdpi/ic_launcher.png b/android/source/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..fa68d30
Binary files /dev/null and b/android/source/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xhdpi/ic_launcher.png b/android/source/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..12069c7
Binary files /dev/null and b/android/source/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xxhdpi/ic_launcher.png b/android/source/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..a00a40d
Binary files /dev/null and b/android/source/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xxxhdpi/ic_launcher.png b/android/source/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..ef7067c
Binary files /dev/null and b/android/source/res/mipmap-xxxhdpi/ic_launcher.png differ


More information about the Libreoffice-commits mailing list