norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

get rid of obsolete inverted_color feature

Browse Source
This commit is contained in:
Adrian Ulrich 2014-10-14 12:58:40 +02:00
parent beb440a7ac
commit bab6b91fdd
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/preference_notifications.xml
View File

@ -35,9 +35,4 @@ THE SOFTWARE.
android:entries="@array/notification_action_entries"
android:entryValues="@array/entry_values"
android:defaultValue="0" />
<CheckBoxPreference
android:key="notification_inverted_color"
android:title="@string/notification_invert_color_title"
android:summary="@string/notification_invert_color_summary"
android:defaultValue="false" />
</PreferenceScreen>

17
src/ch/blinkenlights/android/vanilla/PlaybackService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2012-2013 Adrian Ulrich <adrian@blinkenlights.ch>
* Copyright (C) 2012-2014 Adrian Ulrich <adrian@blinkenlights.ch>
* Copyright (C) 2010, 2011 Christopher Eby <kreed@kreed.org>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
@ -291,10 +291,6 @@ public final class PlaybackService extends Service
* {@link PlaybackService#createNotificationAction(SharedPreferences)}.
*/
private PendingIntent mNotificationAction;
/**
* Use white text instead of black default text in notification.
*/
private boolean mInvertNotification;
private Looper mLooper;
private Handler mHandler;
@ -420,7 +416,6 @@ public final class PlaybackService extends Service
mHeadsetOnly = settings.getBoolean(PrefKeys.HEADSET_ONLY, false);
mStockBroadcast = settings.getBoolean(PrefKeys.STOCK_BROADCAST, false);
mInvertNotification = settings.getBoolean(PrefKeys.NOTIFICATION_INVERTED_COLOR, false);
mNotificationAction = createNotificationAction(settings);
mHeadsetPause = getSettings(this).getBoolean(PrefKeys.HEADSET_PAUSE, true);
mShakeAction = settings.getBoolean(PrefKeys.ENABLE_SHAKE, false) ? Action.getAction(settings, PrefKeys.SHAKE_ACTION, Action.NextSong) : Action.Nothing;
@ -756,9 +751,6 @@ public final class PlaybackService extends Service
} else if (PrefKeys.NOTIFICATION_ACTION.equals(key)) {
mNotificationAction = createNotificationAction(settings);
updateNotification();
} else if (PrefKeys.NOTIFICATION_INVERTED_COLOR.equals(key)) {
mInvertNotification = settings.getBoolean(PrefKeys.NOTIFICATION_INVERTED_COLOR, false);
updateNotification();
} else if (PrefKeys.NOTIFICATION_MODE.equals(key)){
mNotificationMode = Integer.parseInt(settings.getString(PrefKeys.NOTIFICATION_MODE, "1"));
// This is the only way to remove a notification created by
@ -782,8 +774,6 @@ public final class PlaybackService extends Service
} else if (PrefKeys.COVERLOADER_SHADOW.equals(key)) {
Song.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_SHADOW, true) ? Song.mCoverLoadMode | Song.COVER_MODE_SHADOW : Song.mCoverLoadMode & ~(Song.COVER_MODE_SHADOW);
Song.mFlushCoverCache = true;
} else if (PrefKeys.NOTIFICATION_INVERTED_COLOR.equals(key)) {
updateNotification();
} else if (PrefKeys.HEADSET_ONLY.equals(key)) {
mHeadsetOnly = settings.getBoolean(key, false);
if (mHeadsetOnly && isSpeakerOn())
@ -1884,11 +1874,6 @@ public final class PlaybackService extends Service
expanded.setTextViewText(R.id.album, song.album);
expanded.setTextViewText(R.id.artist, song.artist);
if (mInvertNotification) {
views.setTextColor(R.id.title, 0xffffffff);
views.setTextColor(R.id.artist, 0xffffffff);
}
Notification notification = new Notification();
notification.contentView = views;
notification.icon = R.drawable.status_icon;

1
src/ch/blinkenlights/android/vanilla/PrefKeys.java
View File

@ -46,7 +46,6 @@ public class PrefKeys {
public static final String MEDIA_BUTTON = "media_button";
public static final String MEDIA_BUTTON_BEEP = "media_button_beep";
public static final String NOTIFICATION_ACTION = "notification_action";
public static final String NOTIFICATION_INVERTED_COLOR = "notification_inverted_color";
public static final String NOTIFICATION_MODE = "notification_mode";
public static final String PLAYBACK_ON_STARTUP = "playback_on_startup";
public static final String SCROBBLE = "scrobble";