diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-02 16:43:01 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-06-03 16:53:03 -0700 |
commit | 267e9ebd056ec4973c4b37c38f949e863de4f24c (patch) | |
tree | 088d070a3f7c9a6fe55ec926933c68731d8fc25c /src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java | |
parent | f024f336cd205f2d1501b02aef0adc0e1c9b5879 (diff) |
Move VM playback from details to call log.
- Delete voicemail playback in the CallDetailActivity.
+ Add voicemail playback to the call log list items.
+ Move the VoicemailPlaybackPresenter to the CallLogFragment.
+ Fix some retaining state for both call log (expanded items), and
preserve rotation/state functionality for voicemail playback. This
included some changes to the Presenter logic.
+ Fix some tests.
Bug: 21471763
Bug: 21170557
Change-Id: I30aae3a52c5bbf74a5075a9666343c337b1fc0df
Diffstat (limited to 'src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java')
-rw-r--r-- | src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java index 0e9ff3bdc..703004d07 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java @@ -76,10 +76,9 @@ public class VoicemailPlaybackLayout extends LinearLayout public PositionUpdater( MediaPlayer mediaPlayer, - int duration, ScheduledExecutorService executorService) { mMediaPlayer = mediaPlayer; - mDuration = duration; + mDuration = mediaPlayer.getDuration(); mExecutorService = executorService; } @@ -167,6 +166,7 @@ public class VoicemailPlaybackLayout extends LinearLayout if (mPresenter == null) { return; } + if (mIsPlaying) { mPresenter.pausePlayback(); } else { @@ -197,7 +197,7 @@ public class VoicemailPlaybackLayout extends LinearLayout mContext = context; LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.playback_layout, this); + inflater.inflate(R.layout.voicemail_playback_layout, this); } @Override @@ -222,7 +222,6 @@ public class VoicemailPlaybackLayout extends LinearLayout @Override public void onPlaybackStarted( MediaPlayer mediaPlayer, - int duration, ScheduledExecutorService executorService) { mIsPlaying = true; @@ -232,7 +231,7 @@ public class VoicemailPlaybackLayout extends LinearLayout onSpeakerphoneOn(mPresenter.isSpeakerphoneOn()); } - mPositionUpdater = new PositionUpdater(mediaPlayer, duration, executorService); + mPositionUpdater = new PositionUpdater(mediaPlayer, executorService); mPositionUpdater.startUpdating(); } @@ -286,6 +285,7 @@ public class VoicemailPlaybackLayout extends LinearLayout if (mPlaybackSeek.getMax() != seekBarMax) { mPlaybackSeek.setMax(seekBarMax); } + mPlaybackSeek.setProgress(seekBarPosition); mPlaybackPosition.setText(formatAsMinutesAndSeconds(seekBarMax - seekBarPosition)); } |