commit 797ca7ddf14855648571adb76ae8a727fbd44f4b
author Nancy Chen <nancychen@google.com> Wed Nov 04 18:41:13 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 04 18:41:13 2015 +0000
tree ebc51af407b261eb3d089adf2d1b6d39a411f0d0
parent 1e67f0637f8258fe49e1ef177bb02b62e911da93
parent 48d95fe1a5a29af6988ecb704a125e7f7865461d

Merge "Reset voicemail playback state on special expand action." into ub-contactsdialer-a-dev am: 2da9768fc8
am: 48d95fe1a5

* commit '48d95fe1a5a29af6988ecb704a125e7f7865461d':
  Reset voicemail playback state on special expand action.

src/com/android/dialer/calllog/CallLogAdapter.java

diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 15519cf..42b2f23 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -211,6 +211,11 @@
                 // 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());
                 }
             }

src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java

diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
index 33210d3..7d72028 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
@@ -376,8 +376,7 @@
     @Override
     public void disableUiElements() {
         mStartStopButton.setEnabled(false);
-        mPlaybackSeek.setEnabled(false);
-        mPlaybackSeek.setThumb(mVoicemailSeekHandleDisabled);
+        resetSeekBar();
     }
 
     @Override