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

Add more defaults to PrefDefaults class

Browse Source
This commit is contained in:
Adrian Ulrich 2015-10-12 13:52:13 +02:00
parent e1e46c5da7
commit 2a803608ec
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ch/blinkenlights/android/vanilla/LibraryActivity.java
View File

@ -196,7 +196,7 @@ public class LibraryActivity
mActionControls = controls;
loadTabOrder();
int page = settings.getInt(PrefKeys.LIBRARY_PAGE, 0);
int page = settings.getInt(PrefKeys.LIBRARY_PAGE, PrefDefaults.LIBRARY_PAGE);
if (page != 0) {
pager.setCurrentItem(page);
}

4
src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java
View File

@ -75,7 +75,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
{
if (sBeep == -1) {
SharedPreferences settings = PlaybackService.getSettings(context);
sBeep = settings.getBoolean(PrefKeys.MEDIA_BUTTON_BEEP, true) ? 1 : 0;
sBeep = settings.getBoolean(PrefKeys.MEDIA_BUTTON_BEEP, PrefDefaults.MEDIA_BUTTON_BEEP) ? 1 : 0;
}
if (sBeep == 1) {
@ -113,7 +113,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
{
if (sUseControls == -1) {
SharedPreferences settings = PlaybackService.getSettings(context);
sUseControls = settings.getBoolean(PrefKeys.MEDIA_BUTTON, true) ? 1 : 0;
sUseControls = settings.getBoolean(PrefKeys.MEDIA_BUTTON, PrefDefaults.MEDIA_BUTTON) ? 1 : 0;
}
return sUseControls == 1;

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

@ -450,18 +450,18 @@ public final class PlaybackService extends Service
mNotificationMode = Integer.parseInt(settings.getString(PrefKeys.NOTIFICATION_MODE, PrefDefaults.NOTIFICATION_MODE));
mNotificationNag = settings.getBoolean(PrefKeys.NOTIFICATION_NAG, PrefDefaults.NOTIFICATION_NAG);
mScrobble = settings.getBoolean(PrefKeys.SCROBBLE, PrefDefaults.SCROBBLE);
mIdleTimeout = settings.getBoolean(PrefKeys.USE_IDLE_TIMEOUT, PrefDefaults.USE_IDLE_TIMEOUT) ? settings.getInt(PrefKeys.IDLE_TIMEOUT, 3600) : 0;
mIdleTimeout = settings.getBoolean(PrefKeys.USE_IDLE_TIMEOUT, PrefDefaults.USE_IDLE_TIMEOUT) ? settings.getInt(PrefKeys.IDLE_TIMEOUT, PrefDefaults.IDLE_TIMEOUT) : 0;
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_ANDROID, true) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_ANDROID : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_ANDROID);
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_VANILLA, true) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_VANILLA : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_VANILLA);
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_SHADOW , true) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_SHADOW : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_SHADOW);
mHeadsetOnly = settings.getBoolean(PrefKeys.HEADSET_ONLY, false);
mCycleContinuousShuffling = settings.getBoolean(PrefKeys.CYCLE_CONTINUOUS_SHUFFLING, false);
mHeadsetOnly = settings.getBoolean(PrefKeys.HEADSET_ONLY, PrefDefaults.HEADSET_ONLY);
mCycleContinuousShuffling = settings.getBoolean(PrefKeys.CYCLE_CONTINUOUS_SHUFFLING, PrefDefaults.CYCLE_CONTINUOUS_SHUFFLING);
mStockBroadcast = settings.getBoolean(PrefKeys.STOCK_BROADCAST, PrefDefaults.STOCK_BROADCAST);
mNotificationAction = createNotificationAction(settings);
mHeadsetPause = getSettings(this).getBoolean(PrefKeys.HEADSET_PAUSE, true);
mShakeAction = settings.getBoolean(PrefKeys.ENABLE_SHAKE, false) ? Action.getAction(settings, PrefKeys.SHAKE_ACTION, PrefDefaults.SHAKE_ACTION) : Action.Nothing;
mHeadsetPause = getSettings(this).getBoolean(PrefKeys.HEADSET_PAUSE, PrefDefaults.HEADSET_PAUSE);
mShakeAction = settings.getBoolean(PrefKeys.ENABLE_SHAKE, PrefDefaults.ENABLE_SHAKE) ? Action.getAction(settings, PrefKeys.SHAKE_ACTION, PrefDefaults.SHAKE_ACTION) : Action.Nothing;
mShakeThreshold = settings.getInt(PrefKeys.SHAKE_THRESHOLD, PrefDefaults.SHAKE_THRESHOLD) / 10.0f;
mReplayGainTrackEnabled = settings.getBoolean(PrefKeys.ENABLE_TRACK_REPLAYGAIN, PrefDefaults.ENABLE_TRACK_REPLAYGAIN);
@ -816,7 +816,7 @@ public final class PlaybackService extends Service
{
SharedPreferences settings = getSettings(this);
if (PrefKeys.HEADSET_PAUSE.equals(key)) {
mHeadsetPause = settings.getBoolean(PrefKeys.HEADSET_PAUSE, true);
mHeadsetPause = settings.getBoolean(PrefKeys.HEADSET_PAUSE, PrefDefaults.HEADSET_PAUSE);
} else if (PrefKeys.NOTIFICATION_ACTION.equals(key)) {
mNotificationAction = createNotificationAction(settings);
updateNotification();
@ -835,7 +835,7 @@ public final class PlaybackService extends Service
} else if (PrefKeys.MEDIA_BUTTON.equals(key) || PrefKeys.MEDIA_BUTTON_BEEP.equals(key)) {
MediaButtonReceiver.reloadPreference(this);
} else if (PrefKeys.USE_IDLE_TIMEOUT.equals(key) || PrefKeys.IDLE_TIMEOUT.equals(key)) {
mIdleTimeout = settings.getBoolean(PrefKeys.USE_IDLE_TIMEOUT, PrefDefaults.USE_IDLE_TIMEOUT) ? settings.getInt(PrefKeys.IDLE_TIMEOUT, 3600) : 0;
mIdleTimeout = settings.getBoolean(PrefKeys.USE_IDLE_TIMEOUT, PrefDefaults.USE_IDLE_TIMEOUT) ? settings.getInt(PrefKeys.IDLE_TIMEOUT, PrefDefaults.IDLE_TIMEOUT) : 0;
userActionTriggered();
} else if (PrefKeys.COVERLOADER_ANDROID.equals(key)) {
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_ANDROID, true) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_ANDROID : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_ANDROID);
@ -847,16 +847,16 @@ public final class PlaybackService extends Service
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_SHADOW, true) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_SHADOW : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_SHADOW);
CoverCache.evictAll();
} else if (PrefKeys.HEADSET_ONLY.equals(key)) {
mHeadsetOnly = settings.getBoolean(key, false);
mHeadsetOnly = settings.getBoolean(key, PrefDefaults.HEADSET_ONLY);
if (mHeadsetOnly && isSpeakerOn())
unsetFlag(FLAG_PLAYING);
} else if (PrefKeys.CYCLE_CONTINUOUS_SHUFFLING.equals(key)) {
mCycleContinuousShuffling = settings.getBoolean(key, false);
mCycleContinuousShuffling = settings.getBoolean(key, PrefDefaults.CYCLE_CONTINUOUS_SHUFFLING);
setShuffleMode(SongTimeline.SHUFFLE_NONE);
} else if (PrefKeys.STOCK_BROADCAST.equals(key)) {
mStockBroadcast = settings.getBoolean(key, PrefDefaults.STOCK_BROADCAST);
} else if (PrefKeys.ENABLE_SHAKE.equals(key) || PrefKeys.SHAKE_ACTION.equals(key)) {
mShakeAction = settings.getBoolean(PrefKeys.ENABLE_SHAKE, false) ? Action.getAction(settings, PrefKeys.SHAKE_ACTION, PrefDefaults.SHAKE_ACTION) : Action.Nothing;
mShakeAction = settings.getBoolean(PrefKeys.ENABLE_SHAKE, PrefDefaults.ENABLE_SHAKE) ? Action.getAction(settings, PrefKeys.SHAKE_ACTION, PrefDefaults.SHAKE_ACTION) : Action.Nothing;
setupSensor();
} else if (PrefKeys.SHAKE_THRESHOLD.equals(key)) {
mShakeThreshold = settings.getInt(PrefKeys.SHAKE_THRESHOLD, PrefDefaults.SHAKE_THRESHOLD) / 10.0f;

16
src/ch/blinkenlights/android/vanilla/PrefDefaults.java
View File

@ -37,15 +37,15 @@ public class PrefDefaults {
public static final String DISABLE_LOCKSCREEN = "disable_lockscreen";
public static final String DISPLAY_MODE = "display_mode";
public static final String DOUBLE_TAP = "double_tap";
public static final String ENABLE_SHAKE = "enable_shake";
public static final String HEADSET_ONLY = "headset_only";
public static final String CYCLE_CONTINUOUS_SHUFFLING = "cycle_continuous_shuffling";
public static final String HEADSET_PAUSE = "headset_pause";
public static final String IDLE_TIMEOUT = "idle_timeout";
public static final String LIBRARY_PAGE = "library_page";
public static final String MEDIA_BUTTON = "media_button";
public static final String MEDIA_BUTTON_BEEP = "media_button_beep";
*/
public static final boolean ENABLE_SHAKE = false;
public static final boolean HEADSET_ONLY = false;
public static final boolean CYCLE_CONTINUOUS_SHUFFLING = false;
public static final boolean HEADSET_PAUSE = true;
public static final int IDLE_TIMEOUT = 3600;
public static final int LIBRARY_PAGE = 0;
public static final boolean MEDIA_BUTTON = true;
public static final boolean MEDIA_BUTTON_BEEP = true;
public static final String NOTIFICATION_ACTION = "0";
public static final String NOTIFICATION_MODE = "1";
public static final boolean NOTIFICATION_NAG = false;