diff options
| author | Nancy Chen <nancychen@google.com> | 2015-11-04 18:35:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-04 18:35:15 +0000 |
| commit | 48d95fe1a5a29af6988ecb704a125e7f7865461d (patch) | |
| tree | ebc51af407b261eb3d089adf2d1b6d39a411f0d0 /src | |
| parent | d1073ef5f27bea6e19cc69721e95fdc37d2381d5 (diff) | |
| parent | 2da9768fc85d8756d7cec48a1d8597ae073c8b3e (diff) | |
Merge "Reset voicemail playback state on special expand action." into ub-contactsdialer-a-dev
am: 2da9768fc8
* commit '2da9768fc85d8756d7cec48a1d8597ae073c8b3e':
Reset voicemail playback state on special expand action.
Diffstat (limited to 'src')
| -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 |