diff options
| author | Nancy Chen <nancychen@google.com> | 2015-11-04 18:26:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-04 18:26:37 +0000 |
| commit | 2da9768fc85d8756d7cec48a1d8597ae073c8b3e (patch) | |
| tree | c62580a9fc60ff000539e11a84aeaf4aa4b807de | |
| parent | 6edbe3c9fb0707a973305b3ec2bb2bc515f4f718 (diff) | |
| parent | d9c364df22e3f75d029ec12185f44fedb1aeacb1 (diff) | |
Merge "Reset voicemail playback state on special expand action." into ub-contactsdialer-a-dev
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 5 | ||||
| -rw-r--r-- | src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 15519cf77..42b2f230d 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -211,6 +211,11 @@ public class CallLogAdapter extends GroupingListAdapter // function on clicks causes the action views to lose the focus indicator. CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) host.getTag(); if (mCurrentlyExpandedPosition != viewHolder.getAdapterPosition()) { + if (mVoicemailPlaybackPresenter != null) { + // Always reset the voicemail playback state on expand. + mVoicemailPlaybackPresenter.resetAll(); + } + expandViewHolderActions((CallLogListItemViewHolder) host.getTag()); } } diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java index 33210d358..7d72028b1 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java @@ -376,8 +376,7 @@ public class VoicemailPlaybackLayout extends LinearLayout @Override public void disableUiElements() { mStartStopButton.setEnabled(false); - mPlaybackSeek.setEnabled(false); - mPlaybackSeek.setThumb(mVoicemailSeekHandleDisabled); + resetSeekBar(); } @Override |