[droid] new launcher icons + fetch launcher icons from media dir

diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile
index 63fdfdc..1fe3de8 100644 (file)
--- a/tools/android/packaging/Makefile
+++ b/tools/android/packaging/Makefile
@@ -78,7 +78,12 @@ extras: libs
        @echo "native_arch=$(ARCH)" > xbmc/res/raw/xbmc.properties
        cd xbmc/assets/addons; rm -rf $(EXCLUDED_ADDONS)
        cp -rfp $(PREFIX)/lib/python2.6 xbmc/assets/python2.6/lib/
-       cp -rfp $(XBMCROOT)/media/Splash.png xbmc/res/drawable/splash.png
+       cp -fp $(XBMCROOT)/media/Splash.png xbmc/res/drawable/splash.png
+       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
        cd xbmc/assets/python2.6/lib/python2.6/; rm -rf test config lib-dynload
        mkdir -p tmp/res; $(AAPT) c -S xbmc/res -C tmp/res; cp -r -n xbmc/res tmp/ || true
        $(AAPT) p -f -I $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar -S tmp/res/ -M xbmc/AndroidManifest.xml -F images/xbmcapp-debug-skeleton.apk -J xbmc/src

diff --git a/tools/android/packaging/media/drawable-hdpi/ic_launcher.png b/tools/android/packaging/media/drawable-hdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..62f2673
Binary files /dev/null and b/tools/android/packaging/media/drawable-hdpi/ic_launcher.png differ

diff --git a/tools/android/packaging/media/drawable-ldpi/ic_launcher.png b/tools/android/packaging/media/drawable-ldpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..9fc8088
Binary files /dev/null and b/tools/android/packaging/media/drawable-ldpi/ic_launcher.png differ

diff --git a/tools/android/packaging/media/drawable-mdpi/ic_launcher.png b/tools/android/packaging/media/drawable-mdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..9fc1d9b
Binary files /dev/null and b/tools/android/packaging/media/drawable-mdpi/ic_launcher.png differ

diff --git a/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..a6631ce
Binary files /dev/null and b/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png differ

diff --git a/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..30035ff
Binary files /dev/null and b/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png differ

diff --git a/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..09d9993
Binary files /dev/null and b/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png differ

diff --git a/tools/android/packaging/media/playstore.png b/tools/android/packaging/media/playstore.png
new file mode 100644 (file)
index 0000000..8ffb8b8
Binary files /dev/null and b/tools/android/packaging/media/playstore.png differ

diff --git a/tools/android/packaging/xbmc/res/drawable-hdpi/.gitkeep b/tools/android/packaging/xbmc/res/drawable-hdpi/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tools/android/packaging/xbmc/res/drawable-hdpi/ic_launcher.png b/tools/android/packaging/xbmc/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644 (file)
index d7f7e95..0000000
Binary files a/tools/android/packaging/xbmc/res/drawable-hdpi/ic_launcher.png and /dev/null differ

diff --git a/tools/android/packaging/xbmc/res/drawable-ldpi/.gitkeep b/tools/android/packaging/xbmc/res/drawable-ldpi/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tools/android/packaging/xbmc/res/drawable-ldpi/ic_launcher.png b/tools/android/packaging/xbmc/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644 (file)
index 4a6e213..0000000
Binary files a/tools/android/packaging/xbmc/res/drawable-ldpi/ic_launcher.png and /dev/null differ

diff --git a/tools/android/packaging/xbmc/res/drawable-mdpi/.gitkeep b/tools/android/packaging/xbmc/res/drawable-mdpi/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tools/android/packaging/xbmc/res/drawable-mdpi/ic_launcher.png b/tools/android/packaging/xbmc/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644 (file)
index 7eaa3da..0000000
Binary files a/tools/android/packaging/xbmc/res/drawable-mdpi/ic_launcher.png and /dev/null differ

diff --git a/tools/android/packaging/xbmc/res/drawable-xhdpi/.gitkeep b/tools/android/packaging/xbmc/res/drawable-xhdpi/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tools/android/packaging/xbmc/res/drawable-xxhdpi/.gitkeep b/tools/android/packaging/xbmc/res/drawable-xxhdpi/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29