From bcc9493781e3a2e84eee9d42da5875ad733bae14 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Tue, 8 Sep 2015 17:00:53 -0700
Subject: Improve speakerphone setting.

+ Persist speakerphone setting across resume/pause.
+ Allow toggling speakerphone before voicemail is played or while
loading.

Bug: 23566924
Bug: 23716100
Change-Id: Icc7342be85bd6df0f4678134b222f2200d3fc56d
---
 .../android/dialer/voicemail/VoicemailPlaybackLayout.java    | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to '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 69c075f80..133da363d 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
@@ -159,7 +159,7 @@ public class VoicemailPlaybackLayout extends LinearLayout
         @Override
         public void onClick(View v) {
             if (mPresenter != null) {
-                onSpeakerphoneOn(!mPresenter.isSpeakerphoneOn());
+                mPresenter.toggleSpeakerphone();
             }
         }
     };
@@ -286,10 +286,6 @@ public class VoicemailPlaybackLayout extends LinearLayout
 
         mStartStopButton.setImageResource(R.drawable.ic_pause);
 
-        if (mPresenter != null) {
-            onSpeakerphoneOn(mPresenter.isSpeakerphoneOn());
-        }
-
         if (mPositionUpdater != null) {
             mPositionUpdater.stopUpdating();
             mPositionUpdater = null;
@@ -321,10 +317,6 @@ public class VoicemailPlaybackLayout extends LinearLayout
     }
 
     public void onSpeakerphoneOn(boolean on) {
-        if (mPresenter != null) {
-            mPresenter.setSpeakerphoneOn(on);
-        }
-
         if (on) {
             mPlaybackSpeakerphone.setImageResource(R.drawable.ic_volume_up_24dp);
             // Speaker is now on, tapping button will turn it off.
@@ -373,7 +365,6 @@ public class VoicemailPlaybackLayout extends LinearLayout
     @Override
     public void disableUiElements() {
         mStartStopButton.setEnabled(false);
-        mPlaybackSpeakerphone.setEnabled(false);
         mPlaybackSeek.setProgress(0);
         mPlaybackSeek.setEnabled(false);
 
@@ -384,7 +375,6 @@ public class VoicemailPlaybackLayout extends LinearLayout
     @Override
     public void enableUiElements() {
         mStartStopButton.setEnabled(true);
-        mPlaybackSpeakerphone.setEnabled(true);
         mPlaybackSeek.setEnabled(true);
 
         mPositionText.setVisibility(View.VISIBLE);
-- 
cgit v1.2.3