Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

On sleep timer about to expire, lower volume even more

This commit is contained in:
Martin Fietz 2015-08-09 12:14:09 +02:00
parent 771b1e2a16
commit 98a6ab144b
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -19,7 +19,6 @@ import android.media.MediaMetadataRetriever;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.RemoteControlClient; import android.media.RemoteControlClient;
import android.media.RemoteControlClient.MetadataEditor; import android.media.RemoteControlClient.MetadataEditor;
import android.os.AsyncTask;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
@ -33,12 +32,9 @@ import android.widget.Toast;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.SimpleTarget;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -406,7 +402,7 @@ public class PlaybackService extends Service {
@Override @Override
public void onSleepTimerAlmostExpired() { public void onSleepTimerAlmostExpired() {
mediaPlayer.setVolume(0.5f); mediaPlayer.setVolume(0.1f);
} }
@Override @Override

2
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java
View File

@ -350,8 +350,6 @@ public class PlaybackServiceTaskManager {
waitingTime -= now - lastTick; waitingTime -= now - lastTick;
lastTick = now; lastTick = now;
Log.d(TAG, "time left: " + waitingTime);
if(waitingTime < NOTIFICATION_THRESHOLD && !notifiedAlmostExpired) { if(waitingTime < NOTIFICATION_THRESHOLD && !notifiedAlmostExpired) {
Log.d(TAG, "Sleep timer is about to expire"); Log.d(TAG, "Sleep timer is about to expire");
if(vibrate) { if(vibrate) {

2
core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java
View File

@ -24,6 +24,8 @@ public class ShakeListener implements SensorEventListener
} }
public void resume() { public void resume() {
// only a precaution, the user should actually not be able to activate shake to reset
// when the accelerometer is not available
mSensorMgr = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE); mSensorMgr = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
if (mSensorMgr == null) { if (mSensorMgr == null) {
throw new UnsupportedOperationException("Sensors not supported"); throw new UnsupportedOperationException("Sensors not supported");