Skip to content

M
mpd
Commit 14d3a7ae authored by Thomas Guillem's avatar Thomas Guillem Committed by Max Kellermann
Browse files
Options

android: use a gray notification icon

parent f37ab548
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
Makefile.am
View file @ 14d3a7ae
...@@ -328,7 +328,7 @@ $(ANDROID_XML_RES_COPIES): $(ANDROID_XML_RES) ...@@ -328,7 +328,7 @@ $(ANDROID_XML_RES_COPIES): $(ANDROID_XML_RES)
@$(MKDIR_P) $(dir $@) @$(MKDIR_P) $(dir $@)
cp $(patsubst android/build/%,$(srcdir)/android/%,$@) $@ 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 @$(MKDIR_P) android/build/gen
$(AAPT) package -f -m --auto-add-overlay \ $(AAPT) package -f -m --auto-add-overlay \
--custom-package org.musicpd \ --custom-package org.musicpd \
...@@ -362,6 +362,9 @@ android/build/res/drawable/icon.png: mpd.svg ...@@ -362,6 +362,9 @@ android/build/res/drawable/icon.png: mpd.svg
mkdir -p $(@D) mkdir -p $(@D)
rsvg-convert --width=48 --height=48 $< -o $@ 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 .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 android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/$(ANDROID_ABI)/libmpd.so
cp android/build/resources.apk $@ cp android/build/resources.apk $@
......
android/src/Main.java
View file @ 14d3a7ae
...@@ -206,19 +206,19 @@ public class Main extends Service implements Runnable { ...@@ -206,19 +206,19 @@ public class Main extends Service implements Runnable {
notification = buildNotificationJB( notification = buildNotificationJB(
R.string.notification_title_mpd_running, R.string.notification_title_mpd_running,
R.string.notification_text_mpd_running, R.string.notification_text_mpd_running,
R.drawable.icon, R.drawable.notification_icon,
contentIntent); contentIntent);
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
notification = buildNotificationHC( notification = buildNotificationHC(
R.string.notification_title_mpd_running, R.string.notification_title_mpd_running,
R.string.notification_text_mpd_running, R.string.notification_text_mpd_running,
R.drawable.icon, R.drawable.notification_icon,
contentIntent); contentIntent);
else else
notification = buildNotificationGB( notification = buildNotificationGB(
R.string.notification_title_mpd_running, R.string.notification_title_mpd_running,
R.string.notification_text_mpd_running, R.string.notification_text_mpd_running,
R.drawable.icon, R.drawable.notification_icon,
contentIntent); contentIntent);
startForeground(R.string.notification_title_mpd_running, notification); startForeground(R.string.notification_title_mpd_running, notification);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment