Merge pull request #25054 from joseluismarti/mipmap

[Android] Place launcher icons in mipmap- folders

9 files changed, 6 insertions, 13 deletions

diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 98a15226a8..ca3c5c784a 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -60,17 +60,10 @@ python: | xbmc/assets
 	cd xbmc/assets/python@PYTHON_VERSION@/lib/python@PYTHON_VERSION@/; rm -rf test config config-@PYTHON_VERSION@ lib-dynload ; find . -name "*.so" -exec rm -f {} \;
 
 res:
-	mkdir -p xbmc/res xbmc/res/values images
+	mkdir -p xbmc/res xbmc/res/values
+	cp -rfp media/mipmap-* xbmc/res/
 	cp -fp $(CMAKE_SOURCE_DIR)/media/applaunch_screen.png xbmc/res/drawable/
-	cp -fp media/drawable-hdpi/ic_launcher.png xbmc/res/drawable-hdpi/ic_launcher.png
-	cp -fp media/drawable-ldpi/ic_launcher.png xbmc/res/drawable-ldpi/ic_launcher.png
-	cp -fp media/drawable-mdpi/ic_launcher.png xbmc/res/drawable-mdpi/ic_launcher.png
-	cp -fp media/drawable-xhdpi/ic_launcher.png xbmc/res/drawable-xhdpi/ic_launcher.png
-	cp -fp media/drawable-xxhdpi/ic_launcher.png xbmc/res/drawable-xxhdpi/ic_launcher.png
 	cp -fp $(CMAKE_SOURCE_DIR)/media/applaunch_screen.png xbmc/res/drawable-xxxhdpi/
-	cp -fp media/drawable-xxxhdpi/ic_launcher.png xbmc/res/drawable-xxxhdpi/ic_launcher.png
-	cp -fp media/drawable-xhdpi/banner.png xbmc/res/drawable-xhdpi/banner.png
-	cp -fp $(CMAKE_SOURCE_DIR)/media/icon80x80.png xbmc/res/drawable/ic_recommendation_80dp.png
 	cp xbmc/strings.xml xbmc/res/values/
 	cp xbmc/colors.xml xbmc/res/values/
 	cp xbmc/searchable.xml xbmc/res/xml/
@@ -108,12 +101,12 @@ $(PREFIX)/lib/xbmc/lib@APP_NAME_LC@.so: $(SRCLIBS)
 $(SRCLIBS):
 
 apk-clean:
-	rm -rf images
 	rm -rf xbmc/java
 	rm -rf xbmc/lib
 	rm -rf xbmc/assets
 	rm -rf xbmc/obj
 	rm -rf xbmc/res/values
+	rm -rf xbmc/res/mipmap-*
 	rm -f xbmc/res/drawable/applaunch_screen.png
 	rm -f xbmc/res/drawable-xxxhdpi/applaunch_screen.png
 	rm -rf assets
diff --git a/tools/android/packaging/media/drawable-hdpi/ic_launcher.png b/tools/android/packaging/media/mipmap-hdpi/ic_launcher.png
index 2b262791af..2b262791af 100644
--- a/tools/android/packaging/media/drawable-hdpi/ic_launcher.png
+++ b/tools/android/packaging/media/mipmap-hdpi/ic_launcher.png
diff --git a/tools/android/packaging/media/drawable-ldpi/ic_launcher.png b/tools/android/packaging/media/mipmap-ldpi/ic_launcher.png
index 20b2344fbe..20b2344fbe 100644
--- a/tools/android/packaging/media/drawable-ldpi/ic_launcher.png
+++ b/tools/android/packaging/media/mipmap-ldpi/ic_launcher.png
diff --git a/tools/android/packaging/media/drawable-mdpi/ic_launcher.png b/tools/android/packaging/media/mipmap-mdpi/ic_launcher.png
index 9a9da949f3..9a9da949f3 100644
--- a/tools/android/packaging/media/drawable-mdpi/ic_launcher.png
+++ b/tools/android/packaging/media/mipmap-mdpi/ic_launcher.png
diff --git a/tools/android/packaging/media/drawable-xhdpi/banner.png b/tools/android/packaging/media/mipmap-xhdpi/banner.png
index 86a2eeb14f..86a2eeb14f 100644
--- a/tools/android/packaging/media/drawable-xhdpi/banner.png
+++ b/tools/android/packaging/media/mipmap-xhdpi/banner.png
diff --git a/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png b/tools/android/packaging/media/mipmap-xhdpi/ic_launcher.png
index c09dae212e..c09dae212e 100644
--- a/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png
+++ b/tools/android/packaging/media/mipmap-xhdpi/ic_launcher.png
diff --git a/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png b/tools/android/packaging/media/mipmap-xxhdpi/ic_launcher.png
index 0dc4f5eaab..0dc4f5eaab 100644
--- a/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png
+++ b/tools/android/packaging/media/mipmap-xxhdpi/ic_launcher.png
diff --git a/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png b/tools/android/packaging/media/mipmap-xxxhdpi/ic_launcher.png
index 89ce21773c..89ce21773c 100644
--- a/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png
+++ b/tools/android/packaging/media/mipmap-xxxhdpi/ic_launcher.png
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in
index a27d2fea9e..52b28bd0dc 100644
--- a/tools/android/packaging/xbmc/AndroidManifest.xml.in
+++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in
@@ -42,11 +42,11 @@
         android:required="false" />
 
     <application
-        android:banner="@drawable/banner"
+        android:banner="@mipmap/banner"
         android:hasCode="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:logo="@drawable/banner"
+        android:logo="@mipmap/banner"
         android:requestLegacyExternalStorage="true">
         <activity
             android:name=".Splash"