Fix voicemail playback during rotation.
Avoid restarting the visual voice mail media player from the
beginning while rotating the device.
Bug: 18254556
Change-Id: I967fbcd8dbe9427b521de2b1830de040cca674c7
Signed-off-by: gilles le brun <gilles.lebrun.pro@gmail.com>
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java
index 31db177..0d5c3de 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java
@@ -120,6 +120,12 @@
}
@Override
+ public void onViewStateRestored(Bundle savedInstanceState) {
+ mPresenter.onRestoreInstanceState(savedInstanceState);
+ super.onViewStateRestored(savedInstanceState);
+ }
+
+ @Override
public void onDestroy() {
shutdownMediaPlayer();
mPresenter.onDestroy();
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index cb246f4..30fea1a 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -32,6 +32,7 @@
import com.android.dialer.util.AsyncTaskExecutor;
import com.android.ex.variablespeed.MediaPlayerProxy;
import com.android.ex.variablespeed.SingleThreadedMediaPlayerProxy;
+
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
@@ -110,8 +111,8 @@
* If present in the saved instance bundle, we should not resume playback on
* create.
*/
- private static final String PAUSED_STATE_KEY = VoicemailPlaybackPresenter.class.getName()
- + ".PAUSED_STATE_KEY";
+ private static final String IS_PLAYING_STATE_KEY = VoicemailPlaybackPresenter.class.getName()
+ + ".IS_PLAYING_STATE_KEY";
/**
* If present in the saved instance bundle, indicates where to set the
* playback slider.
@@ -169,6 +170,8 @@
private FetchResultHandler mFetchResultHandler;
private PowerManager.WakeLock mWakeLock;
private AsyncTask<Void, ?, ?> mPrepareTask;
+ private int mPosition;
+ private boolean mPlaying;
public VoicemailPlaybackPresenter(PlaybackView view, MediaPlayerProxy player,
Uri voicemailUri, ScheduledExecutorService executorService,
@@ -346,22 +349,34 @@
mView.setSpeakerPhoneOn(mView.isSpeakerPhoneOn());
mView.setRateDecreaseButtonListener(createRateDecreaseListener());
mView.setRateIncreaseButtonListener(createRateIncreaseListener());
- mView.setClipPosition(0, mDuration.get());
- mView.playbackStopped();
- // Always disable on stop.
- mView.disableProximitySensor();
- if (mStartPlayingImmediately) {
- resetPrepareStartPlaying(0);
+ if (mPlaying) {
+ resetPrepareStartPlaying(mPosition);
+ } else {
+ stopPlaybackAtPosition(mPosition, mDuration.get());
+ if ((mPosition == 0) && (mStartPlayingImmediately)) {
+ resetPrepareStartPlaying(0);
+ }
}
- // TODO: Now I'm ignoring the bundle, when previously I was checking for contains against
- // the PAUSED_STATE_KEY, and CLIP_POSITION_KEY.
}
public void onSaveInstanceState(Bundle outState) {
outState.putInt(CLIP_POSITION_KEY, mView.getDesiredClipPosition());
- if (!mPlayer.isPlaying()) {
- outState.putBoolean(PAUSED_STATE_KEY, true);
+ outState.putBoolean(IS_PLAYING_STATE_KEY, mPlaying);
+ }
+
+ public void onRestoreInstanceState(Bundle inState) {
+ int position = 0;
+ boolean isPlaying = false;
+ if (inState != null) {
+ position = inState.getInt(CLIP_POSITION_KEY, 0);
+ isPlaying = inState.getBoolean(IS_PLAYING_STATE_KEY, false);
}
+ setPositionAndPlayingStatus(position, isPlaying) ;
+ }
+
+ private void setPositionAndPlayingStatus(int position, boolean isPlaying) {
+ mPosition = position;
+ mPlaying = isPlaying;
}
public void onDestroy() {
@@ -469,6 +484,7 @@
try {
// Can throw RejectedExecutionException
mPlayer.start();
+ setPositionAndPlayingStatus(mPlayer.getCurrentPosition(), true);
mView.playbackStarted();
if (!mWakeLock.isHeld()) {
mWakeLock.acquire();
@@ -501,6 +517,7 @@
mView.playbackError(e);
mPositionUpdater.stopUpdating();
mPlayer.release();
+ setPositionAndPlayingStatus(0, false);
}
public void handleCompletion(MediaPlayer mediaPlayer) {
@@ -537,10 +554,15 @@
@Override
public void onStopTrackingTouch(SeekBar arg0) {
if (mPlayer.isPlaying()) {
+ setPositionAndPlayingStatus(mPlayer.getCurrentPosition(), false);
stopPlaybackAtPosition(mPlayer.getCurrentPosition(), mDuration.get());
+ } else {
+ setPositionAndPlayingStatus(mView.getDesiredClipPosition(),
+ mShouldResumePlaybackAfterSeeking);
}
+
if (mShouldResumePlaybackAfterSeeking) {
- resetPrepareStartPlaying(mView.getDesiredClipPosition());
+ postSuccessfullyFetchedContent();
}
}
@@ -575,9 +597,11 @@
@Override
public void onClick(View arg0) {
if (mPlayer.isPlaying()) {
+ setPositionAndPlayingStatus(mPlayer.getCurrentPosition(), false);
stopPlaybackAtPosition(mPlayer.getCurrentPosition(), mDuration.get());
} else {
- resetPrepareStartPlaying(mView.getDesiredClipPosition());
+ setPositionAndPlayingStatus(mPosition, true);
+ postSuccessfullyFetchedContent();
}
}
}