diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-11-25 16:05:26 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-11-26 15:23:35 +0000 |
| commit | e40a2670d1a0146d523ba65a9d9ceecceb8c78c4 (patch) | |
| tree | bd276fea1ced026e15f955910349c11f767f6c35 /android | |
| parent | 42b959ff7241f955bfa68ee484d81c2d90be5434 (diff) | |
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>
Diffstat (limited to 'android')
| -rw-r--r-- | android/source/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/source/ic_launcher-web.png | bin | 0 -> 23194 bytes | |||
| -rw-r--r-- | android/source/res/drawable-hdpi/main.png | bin | 7906 -> 0 bytes | |||
| -rw-r--r-- | android/source/res/mipmap-hdpi/ic_launcher.png | bin | 0 -> 1529 bytes | |||
| -rw-r--r-- | android/source/res/mipmap-mdpi/ic_launcher.png | bin | 0 -> 950 bytes | |||
| -rw-r--r-- | android/source/res/mipmap-xhdpi/ic_launcher.png | bin | 0 -> 2158 bytes | |||
| -rw-r--r-- | android/source/res/mipmap-xxhdpi/ic_launcher.png | bin | 0 -> 5007 bytes | |||
| -rw-r--r-- | android/source/res/mipmap-xxxhdpi/ic_launcher.png | bin | 0 -> 7896 bytes |
8 files changed, 1 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 000000000000..e9dcfcacf844 --- /dev/null +++ b/android/source/ic_launcher-web.png diff --git a/android/source/res/drawable-hdpi/main.png b/android/source/res/drawable-hdpi/main.png Binary files differdeleted file mode 100644 index 99c826dcda13..000000000000 --- a/android/source/res/drawable-hdpi/main.png +++ /dev/null diff --git a/android/source/res/mipmap-hdpi/ic_launcher.png b/android/source/res/mipmap-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000000..f8b74553e385 --- /dev/null +++ b/android/source/res/mipmap-hdpi/ic_launcher.png diff --git a/android/source/res/mipmap-mdpi/ic_launcher.png b/android/source/res/mipmap-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000000..fa68d30f003a --- /dev/null +++ b/android/source/res/mipmap-mdpi/ic_launcher.png diff --git a/android/source/res/mipmap-xhdpi/ic_launcher.png b/android/source/res/mipmap-xhdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000000..12069c7e8ac5 --- /dev/null +++ b/android/source/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/source/res/mipmap-xxhdpi/ic_launcher.png b/android/source/res/mipmap-xxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000000..a00a40dbe1de --- /dev/null +++ b/android/source/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/source/res/mipmap-xxxhdpi/ic_launcher.png b/android/source/res/mipmap-xxxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000000..ef7067cbd2a3 --- /dev/null +++ b/android/source/res/mipmap-xxxhdpi/ic_launcher.png |
