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

Add idle grace period

Browse Source 
This fixes issue #35
This commit is contained in:
Christopher Eby 2012-01-10 08:14:48 -06:00
parent fde5985b32
commit d441686f19
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/kreed/vanilla/PlaybackService.java
View File

@ -46,6 +46,7 @@ import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.SystemClock;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
@ -209,6 +210,12 @@ public final class PlaybackService extends Service
*/ */
private static final int NOT_ACTION_NEXT_SONG = 2; private static final int NOT_ACTION_NEXT_SONG = 2;
/**
* If a user action is triggered within this time (in ms) after the
* idle time fade-out occurs, playback will be resumed.
*/
private static final long IDLE_GRACE_PERIOD = 60000;
private static final Object sWait = new Object(); private static final Object sWait = new Object();
private static PlaybackService sInstance; private static PlaybackService sInstance;
private static final ArrayList<PlaybackActivity> sActivities = new ArrayList<PlaybackActivity>(5); private static final ArrayList<PlaybackActivity> sActivities = new ArrayList<PlaybackActivity>(5);
@ -277,6 +284,11 @@ public final class PlaybackService extends Service
* when fading the volume. * when fading the volume.
*/ */
private float mCurrentVolume = 1.0f; private float mCurrentVolume = 1.0f;
/**
* Elapsed realtime at which playback was paused by idle timeout. -1
* indicates that no timeout has occurred.
*/
private long mIdleStart = -1;
@Override @Override
public void onCreate() public void onCreate()
@ -1013,6 +1025,7 @@ public final class PlaybackService extends Service
case FADE_OUT: case FADE_OUT:
int progress = message.arg1 - 1; int progress = message.arg1 - 1;
if (progress == 0) { if (progress == 0) {
mIdleStart = SystemClock.elapsedRealtime();
unsetFlag(FLAG_PLAYING); unsetFlag(FLAG_PLAYING);
mCurrentVolume = mUserVolume; mCurrentVolume = mUserVolume;
} else { } else {
@ -1136,7 +1149,7 @@ public final class PlaybackService extends Service
/** /**
* Resets the idle timeout countdown. Should be called by a user action * Resets the idle timeout countdown. Should be called by a user action
* has been trigger (new song chosen or playback toggled). * has been triggered (new song chosen or playback toggled).
* *
* If an idle fade out is actually in progress, aborts it and resets the * If an idle fade out is actually in progress, aborts it and resets the
* volume. * volume.
@ -1148,6 +1161,12 @@ public final class PlaybackService extends Service
if (mIdleTimeout != 0) if (mIdleTimeout != 0)
mHandler.sendEmptyMessageDelayed(IDLE_TIMEOUT, mIdleTimeout * 1000); mHandler.sendEmptyMessageDelayed(IDLE_TIMEOUT, mIdleTimeout * 1000);
long idleStart = mIdleStart;
if (idleStart != -1 && SystemClock.elapsedRealtime() - idleStart < IDLE_GRACE_PERIOD) {
mIdleStart = -1;
setFlag(FLAG_PLAYING);
}
if (mCurrentVolume != mUserVolume) { if (mCurrentVolume != mUserVolume) {
mCurrentVolume = mUserVolume; mCurrentVolume = mUserVolume;
mMediaPlayer.setVolume(mCurrentVolume, mCurrentVolume); mMediaPlayer.setVolume(mCurrentVolume, mCurrentVolume);