From abe83a1c8434e1f0dc401efce9aa4dd1e9638ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Louren=C3=A7o?= <madequa@users.noreply.github.com>
Date: Mon, 6 Jan 2020 18:37:39 +0000
Subject: Add support for Android adaptive icons.

---
 platform/android/java/app/AndroidManifest.xml           |   2 +-
 platform/android/java/lib/AndroidManifest.xml           |   2 +-
 platform/android/java/lib/res/drawable-nodpi/icon.png   | Bin 7569 -> 0 bytes
 .../android/java/lib/res/mipmap-anydpi-v26/icon.xml     |   5 +++++
 platform/android/java/lib/res/mipmap-hdpi/icon.png      | Bin 0 -> 3762 bytes
 .../java/lib/res/mipmap-hdpi/icon_background.png        | Bin 0 -> 375 bytes
 .../java/lib/res/mipmap-hdpi/icon_foreground.png        | Bin 0 -> 2998 bytes
 platform/android/java/lib/res/mipmap-mdpi/icon.png      | Bin 0 -> 2672 bytes
 .../java/lib/res/mipmap-mdpi/icon_background.png        | Bin 0 -> 240 bytes
 .../java/lib/res/mipmap-mdpi/icon_foreground.png        | Bin 0 -> 1909 bytes
 platform/android/java/lib/res/mipmap-xhdpi/icon.png     | Bin 0 -> 5186 bytes
 .../java/lib/res/mipmap-xhdpi/icon_background.png       | Bin 0 -> 517 bytes
 .../java/lib/res/mipmap-xhdpi/icon_foreground.png       | Bin 0 -> 4490 bytes
 platform/android/java/lib/res/mipmap-xxhdpi/icon.png    | Bin 0 -> 8154 bytes
 .../java/lib/res/mipmap-xxhdpi/icon_background.png      | Bin 0 -> 905 bytes
 .../java/lib/res/mipmap-xxhdpi/icon_foreground.png      | Bin 0 -> 7415 bytes
 platform/android/java/lib/res/mipmap-xxxhdpi/icon.png   | Bin 0 -> 11749 bytes
 .../java/lib/res/mipmap-xxxhdpi/icon_background.png     | Bin 0 -> 1360 bytes
 .../java/lib/res/mipmap-xxxhdpi/icon_foreground.png     | Bin 0 -> 11325 bytes
 platform/android/java/lib/res/mipmap/icon.png           | Bin 0 -> 11749 bytes
 .../android/java/lib/res/mipmap/icon_background.png     | Bin 0 -> 240 bytes
 .../android/java/lib/res/mipmap/icon_foreground.png     | Bin 0 -> 1909 bytes
 22 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 platform/android/java/lib/res/drawable-nodpi/icon.png
 create mode 100644 platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml
 create mode 100644 platform/android/java/lib/res/mipmap-hdpi/icon.png
 create mode 100644 platform/android/java/lib/res/mipmap-hdpi/icon_background.png
 create mode 100644 platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png
 create mode 100644 platform/android/java/lib/res/mipmap-mdpi/icon.png
 create mode 100644 platform/android/java/lib/res/mipmap-mdpi/icon_background.png
 create mode 100644 platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png
 create mode 100644 platform/android/java/lib/res/mipmap-xhdpi/icon.png
 create mode 100644 platform/android/java/lib/res/mipmap-xhdpi/icon_background.png
 create mode 100644 platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png
 create mode 100644 platform/android/java/lib/res/mipmap-xxhdpi/icon.png
 create mode 100644 platform/android/java/lib/res/mipmap-xxhdpi/icon_background.png
 create mode 100644 platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png
 create mode 100644 platform/android/java/lib/res/mipmap-xxxhdpi/icon.png
 create mode 100644 platform/android/java/lib/res/mipmap-xxxhdpi/icon_background.png
 create mode 100644 platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png
 create mode 100644 platform/android/java/lib/res/mipmap/icon.png
 create mode 100644 platform/android/java/lib/res/mipmap/icon_background.png
 create mode 100644 platform/android/java/lib/res/mipmap/icon_foreground.png

(limited to 'platform/android/java')

diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml
index ba01ec313b..7e9ce70d80 100644
--- a/platform/android/java/app/AndroidManifest.xml
+++ b/platform/android/java/app/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <!-- Any tag in this line after android:icon will be erased when doing custom builds. -->
     <!-- If you want to add tags manually, do before it. -->
     <!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. -->
-    <application android:label="@string/godot_project_name_string" android:allowBackup="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@drawable/icon" >
+    <application android:label="@string/godot_project_name_string" android:allowBackup="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon" >
 
         <!-- The following metadata values are replaced when Godot exports, modifying them here has no effect. -->
         <!-- Do these changes in the export preset. Adding new ones is fine. -->
diff --git a/platform/android/java/lib/AndroidManifest.xml b/platform/android/java/lib/AndroidManifest.xml
index 517fc403b2..b133585f99 100644
--- a/platform/android/java/lib/AndroidManifest.xml
+++ b/platform/android/java/lib/AndroidManifest.xml
@@ -11,7 +11,7 @@
     </application>
 
     <instrumentation
-        android:icon="@drawable/icon"
+        android:icon="@mipmap/icon"
         android:label="@string/godot_project_name_string"
         android:name=".GodotInstrumentation"
         android:targetPackage="org.godotengine.godot" />
diff --git a/platform/android/java/lib/res/drawable-nodpi/icon.png b/platform/android/java/lib/res/drawable-nodpi/icon.png
deleted file mode 100644
index 6ad9b43117..0000000000
Binary files a/platform/android/java/lib/res/drawable-nodpi/icon.png and /dev/null differ
diff --git a/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml b/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml
new file mode 100644
index 0000000000..1ed4037035
--- /dev/null
+++ b/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/icon_background"/>
+    <foreground android:drawable="@mipmap/icon_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon.png b/platform/android/java/lib/res/mipmap-hdpi/icon.png
new file mode 100644
index 0000000000..cc6e113e89
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-hdpi/icon.png differ
diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon_background.png b/platform/android/java/lib/res/mipmap-hdpi/icon_background.png
new file mode 100644
index 0000000000..78445c0181
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-hdpi/icon_background.png differ
diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png
new file mode 100644
index 0000000000..75e409ff74
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png differ
diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon.png b/platform/android/java/lib/res/mipmap-mdpi/icon.png
new file mode 100644
index 0000000000..e1968fe142
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-mdpi/icon.png differ
diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon_background.png b/platform/android/java/lib/res/mipmap-mdpi/icon_background.png
new file mode 100644
index 0000000000..5813f751ed
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-mdpi/icon_background.png differ
diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png
new file mode 100644
index 0000000000..982b69be1e
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png differ
diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon.png b/platform/android/java/lib/res/mipmap-xhdpi/icon.png
new file mode 100644
index 0000000000..9281d8da48
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xhdpi/icon.png differ
diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon_background.png b/platform/android/java/lib/res/mipmap-xhdpi/icon_background.png
new file mode 100644
index 0000000000..4269c822a7
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xhdpi/icon_background.png differ
diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png
new file mode 100644
index 0000000000..726b267ad6
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png differ
diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon.png b/platform/android/java/lib/res/mipmap-xxhdpi/icon.png
new file mode 100644
index 0000000000..7a6b67d273
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xxhdpi/icon.png differ
diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon_background.png b/platform/android/java/lib/res/mipmap-xxhdpi/icon_background.png
new file mode 100644
index 0000000000..5e8b518d17
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xxhdpi/icon_background.png differ
diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png
new file mode 100644
index 0000000000..b0c727f74c
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png differ
diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png b/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png
new file mode 100644
index 0000000000..0881245802
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png differ
diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_background.png b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_background.png
new file mode 100644
index 0000000000..004b6fd508
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_background.png differ
diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png
new file mode 100644
index 0000000000..72e6f92b6e
Binary files /dev/null and b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png differ
diff --git a/platform/android/java/lib/res/mipmap/icon.png b/platform/android/java/lib/res/mipmap/icon.png
new file mode 100644
index 0000000000..0881245802
Binary files /dev/null and b/platform/android/java/lib/res/mipmap/icon.png differ
diff --git a/platform/android/java/lib/res/mipmap/icon_background.png b/platform/android/java/lib/res/mipmap/icon_background.png
new file mode 100644
index 0000000000..5813f751ed
Binary files /dev/null and b/platform/android/java/lib/res/mipmap/icon_background.png differ
diff --git a/platform/android/java/lib/res/mipmap/icon_foreground.png b/platform/android/java/lib/res/mipmap/icon_foreground.png
new file mode 100644
index 0000000000..982b69be1e
Binary files /dev/null and b/platform/android/java/lib/res/mipmap/icon_foreground.png differ
-- 
cgit v1.2.3