From e40a2670d1a0146d523ba65a9d9ceecceb8c78c4 Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Fri, 25 Nov 2016 16:05:26 +0100
Subject: 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@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
---
 android/source/AndroidManifest.xml                |   2 +-
 android/source/ic_launcher-web.png                | Bin 0 -> 23194 bytes
 android/source/res/drawable-hdpi/main.png         | Bin 7906 -> 0 bytes
 android/source/res/mipmap-hdpi/ic_launcher.png    | Bin 0 -> 1529 bytes
 android/source/res/mipmap-mdpi/ic_launcher.png    | Bin 0 -> 950 bytes
 android/source/res/mipmap-xhdpi/ic_launcher.png   | Bin 0 -> 2158 bytes
 android/source/res/mipmap-xxhdpi/ic_launcher.png  | Bin 0 -> 5007 bytes
 android/source/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 7896 bytes
 8 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 android/source/ic_launcher-web.png
 delete mode 100644 android/source/res/drawable-hdpi/main.png
 create mode 100644 android/source/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-xxxhdpi/ic_launcher.png

(limited to 'android')

diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml
index d9d8e1ead395..2c395c12d017 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 000000000000..e9dcfcacf844
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 99c826dcda13..000000000000
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 000000000000..f8b74553e385
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 000000000000..fa68d30f003a
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 000000000000..12069c7e8ac5
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 000000000000..a00a40dbe1de
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 000000000000..ef7067cbd2a3
Binary files /dev/null and b/android/source/res/mipmap-xxxhdpi/ic_launcher.png differ
-- 
cgit