move app_icon.png images from drawable-* to mipmap-*

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33d9c8a88edabf958d3b60df9b1a8ed1105f22a2..8cb9a749d98d2e5326cabc9670dc574bbb9267f0 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,9 +24,9 @@
         android:name=".App"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_descriptor"
-        android:icon="@drawable/app_icon"
+        android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/app_icon"
+        android:roundIcon="@mipmap/app_icon"
         android:supportsRtl="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme"

diff --git a/app/src/main/res/drawable-hdpi/app_icon.png b/app/src/main/res/drawable-hdpi/app_icon.png
deleted file mode 100644 (file)
index 7df4fa1..0000000
Binary files a/app/src/main/res/drawable-hdpi/app_icon.png and /dev/null differ

diff --git a/app/src/main/res/drawable-ldpi/app_icon.png b/app/src/main/res/drawable-ldpi/app_icon.png
deleted file mode 100644 (file)
index ed0d78c..0000000
Binary files a/app/src/main/res/drawable-ldpi/app_icon.png and /dev/null differ

diff --git a/app/src/main/res/drawable-mdpi/app_icon.png b/app/src/main/res/drawable-mdpi/app_icon.png
deleted file mode 100644 (file)
index 4e88a67..0000000
Binary files a/app/src/main/res/drawable-mdpi/app_icon.png and /dev/null differ

diff --git a/app/src/main/res/drawable-tvdpi/app_icon.png b/app/src/main/res/drawable-tvdpi/app_icon.png
deleted file mode 100644 (file)
index 8e8ed13..0000000
Binary files a/app/src/main/res/drawable-tvdpi/app_icon.png and /dev/null differ

diff --git a/app/src/main/res/drawable-xhdpi/app_icon.png b/app/src/main/res/drawable-xhdpi/app_icon.png
deleted file mode 100644 (file)
index a62a8df..0000000
Binary files a/app/src/main/res/drawable-xhdpi/app_icon.png and /dev/null differ

diff --git a/app/src/main/res/drawable-xxhdpi/app_icon.png b/app/src/main/res/drawable-xxhdpi/app_icon.png
deleted file mode 100644 (file)
index 41fe6c4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/app_icon.png and /dev/null differ

diff --git a/app/src/main/res/drawable-xxxhdpi/app_icon.png b/app/src/main/res/drawable-xxxhdpi/app_icon.png
deleted file mode 100644 (file)
index 1a12e02..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/app_icon.png and /dev/null differ

diff --git a/app/src/main/res/mipmap-hdpi/app_icon.png b/app/src/main/res/mipmap-hdpi/app_icon.png
new file mode 100644 (file)
index 0000000..7df4fa1
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/app_icon.png differ

diff --git a/app/src/main/res/mipmap-ldpi/app_icon.png b/app/src/main/res/mipmap-ldpi/app_icon.png
new file mode 100644 (file)
index 0000000..ed0d78c
Binary files /dev/null and b/app/src/main/res/mipmap-ldpi/app_icon.png differ

diff --git a/app/src/main/res/mipmap-mdpi/app_icon.png b/app/src/main/res/mipmap-mdpi/app_icon.png
new file mode 100644 (file)
index 0000000..4e88a67
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/app_icon.png differ

diff --git a/app/src/main/res/mipmap-tvdpi/app_icon.png b/app/src/main/res/mipmap-tvdpi/app_icon.png
new file mode 100644 (file)
index 0000000..8e8ed13
Binary files /dev/null and b/app/src/main/res/mipmap-tvdpi/app_icon.png differ

diff --git a/app/src/main/res/mipmap-xhdpi/app_icon.png b/app/src/main/res/mipmap-xhdpi/app_icon.png
new file mode 100644 (file)
index 0000000..a62a8df
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/app_icon.png differ

diff --git a/app/src/main/res/mipmap-xxhdpi/app_icon.png b/app/src/main/res/mipmap-xxhdpi/app_icon.png
new file mode 100644 (file)
index 0000000..41fe6c4
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/app_icon.png differ

diff --git a/app/src/main/res/mipmap-xxxhdpi/app_icon.png b/app/src/main/res/mipmap-xxxhdpi/app_icon.png
new file mode 100644 (file)
index 0000000..1a12e02
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/app_icon.png differ

diff --git a/tools/populate-app-icon b/tools/populate-app-icon
index cd7ee6efa820b1ab8678bfee1af3380a37127577..d7840dd6068173d85f938c2e6b8e19fa015a4000 100755 (executable)
--- a/tools/populate-app-icon
+++ b/tools/populate-app-icon
@@ -10,8 +10,9 @@ ICON_ART="$ART_DIR/app-icon.svg"
 
 gen_icons() {
     while read size name; do
-        mkdir -p "$RES_DIR/drawable-$name"
-        DST="$RES_DIR/drawable-$name/app_icon.png"
+        DST_DIR="$RES_DIR/mipmap-$name"
+        mkdir -p "$DST_DIR"
+        DST="$DST_DIR/app_icon.png"
         convert -background none "$ICON_ART" -scale ${size}x${size} \
             -antialias -strip \
             "$DST"