oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

android: use a gray notification icon

This commit is contained in:
Thomas Guillem 2014-10-19 15:46:50 +02:00 committed by Max Kellermann
parent f37ab5482b
commit 14d3a7ae83
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -328,7 +328,7 @@ $(ANDROID_XML_RES_COPIES): $(ANDROID_XML_RES)
@$(MKDIR_P) $(dir $@)
cp $(patsubst android/build/%,$(srcdir)/android/%,$@) $@
android/build/resources.apk: $(ANDROID_XML_RES_COPIES) android/build/res/drawable/icon.png
android/build/resources.apk: $(ANDROID_XML_RES_COPIES) android/build/res/drawable/icon.png android/build/res/drawable/notification_icon.png
@$(MKDIR_P) android/build/gen
$(AAPT) package -f -m --auto-add-overlay \
--custom-package org.musicpd \
@ -362,6 +362,9 @@ android/build/res/drawable/icon.png: mpd.svg
mkdir -p $(@D)
rsvg-convert --width=48 --height=48 $< -o $@
android/build/res/drawable/notification_icon.png: android/build/res/drawable/icon.png
convert $< -colorspace Gray -gamma 2.2 $@
.DELETE_ON_ERROR: android/build/unsigned.apk
android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/$(ANDROID_ABI)/libmpd.so
cp android/build/resources.apk $@

6
android/src/Main.java
View File

@ -206,19 +206,19 @@ public class Main extends Service implements Runnable {
notification = buildNotificationJB(
R.string.notification_title_mpd_running,
R.string.notification_text_mpd_running,
R.drawable.icon,
R.drawable.notification_icon,
contentIntent);
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
notification = buildNotificationHC(
R.string.notification_title_mpd_running,
R.string.notification_text_mpd_running,
R.drawable.icon,
R.drawable.notification_icon,
contentIntent);
else
notification = buildNotificationGB(
R.string.notification_title_mpd_running,
R.string.notification_text_mpd_running,
R.drawable.icon,
R.drawable.notification_icon,
contentIntent);
startForeground(R.string.notification_title_mpd_running, notification);