diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5aa8c3d23..e95fd7b80 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -257,8 +257,8 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.
Appel
Utiliser la sonnerie du téléphone
Décrocher automatiquement appels entrants
- Envoyer les DTMFs RFC2833
- Envoyer les DTMFs en SIP INFO
+ Envoyer les DTMFs in-band (RFC2833)
+ Envoyer les DTMFs out-band DTMFs(SIP INFO)
URI de boîte vocale
Chat
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9ab60831..a3392c522 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -277,8 +277,8 @@
Call
Use device ringtone
Auto answer incoming calls
- Send RFC2833 DTMFs
- Send SIP INFO DTMFs
+ Send in-band DTMFs(RFC2833)
+ Send out-band DTMFs(SIP INFO)
Voice mail URI
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 4b91be9a0..ef1f10fc2 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -877,16 +877,9 @@ public class SettingsFragment extends PreferencesListFragment {
deviceRingtone.setChecked(mPrefs.isDeviceRingtoneEnabled());
autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled());
-
- if (mPrefs.useRfc2833Dtmfs()) {
- rfc2833.setChecked(true);
- sipInfo.setChecked(false);
- sipInfo.setEnabled(false);
- } else if (mPrefs.useSipInfoDtmfs()) {
- sipInfo.setChecked(true);
- rfc2833.setChecked(false);
- rfc2833.setEnabled(false);
- }
+
+ rfc2833.setChecked(false);
+ sipInfo.setChecked(false);
setPreferenceDefaultValueAndSummary(R.string.pref_voice_mail_key, mPrefs.getVoiceMailUri());
}
@@ -952,9 +945,6 @@ public class SettingsFragment extends PreferencesListFragment {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean use = (Boolean) newValue;
- CheckBoxPreference sipInfo = (CheckBoxPreference) findPreference(getString(R.string.pref_sipinfo_dtmf_key));
- sipInfo.setEnabled(!use);
- sipInfo.setChecked(false);
mPrefs.sendDtmfsAsRfc2833(use);
return true;
}
@@ -975,9 +965,6 @@ public class SettingsFragment extends PreferencesListFragment {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean use = (Boolean) newValue;
- CheckBoxPreference rfc2833 = (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key));
- rfc2833.setEnabled(!use);
- rfc2833.setChecked(false);
mPrefs.sendDTMFsAsSipInfo(use);
return true;
}