From 12ed17a8852eacc440e9b26b5e83ecc404776efa Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 14 Dec 2010 18:21:36 +0100 Subject: [PATCH] Disabling speaker on Galaxy S as it doesn't support audio routing properly. --- src/org/linphone/DialerActivity.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index 82f5399d7..2199f3206 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone; -import java.util.List; - import org.linphone.component.ToggleImageButton; import org.linphone.component.ToggleImageButton.OnCheckedChangeListener; import org.linphone.core.AndroidCameraRecordManager; @@ -39,10 +37,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; -import android.hardware.Sensor; -import android.hardware.SensorEvent; -import android.hardware.SensorEventListener; -import android.hardware.SensorManager; import android.media.AudioManager; import android.media.MediaPlayer; import android.media.RingtoneManager; @@ -226,6 +220,11 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { mInCallAddressLayout = (View) findViewById(R.id.IncallAddressLayout); mMute = (ToggleImageButton)findViewById(R.id.mic_mute_button); mSpeaker = (ToggleImageButton)findViewById(R.id.speaker_button); + if (Build.DEVICE.startsWith("GT-I9000")) { + // Galaxy S doesn't handle audio routing properly + // so disabling it totally + mSpeaker.setVisibility(View.GONE); + } mInCallControlRow.setVisibility(View.GONE); mInCallAddressLayout.setVisibility(View.GONE); @@ -559,7 +558,6 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { } else { mAudioManager.setSpeakerphoneOn(true); } - } private void routeAudioToReceiver() { if (Integer.parseInt(Build.VERSION.SDK) <=4 /*