Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pref: use AAC-ELD title instead of mpeg4-generic (mime-type)

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2014-10-14 21:32:21 +02:00
parent 4e665df2e0
commit 1105425508
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/org/linphone/SettingsFragment.java
View file

@ -139,7 +139,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
if (getResources().getBoolean(R.bool.hide_wizard)){ if (getResources().getBoolean(R.bool.hide_wizard)){
hidePreference(R.string.setup_key); hidePreference(R.string.setup_key);
} }
if(!getResources().getBoolean(R.bool.replace_wizard_with_old_interface)){ if(!getResources().getBoolean(R.bool.replace_wizard_with_old_interface)){
hidePreference(R.string.pref_add_account_key); hidePreference(R.string.pref_add_account_key);
} }
@ -427,6 +427,21 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
for (final PayloadType pt : lc.getAudioCodecs()) { for (final PayloadType pt : lc.getAudioCodecs()) {
CheckBoxPreference codec = new CheckBoxPreference(LinphoneService.instance()); CheckBoxPreference codec = new CheckBoxPreference(LinphoneService.instance());
codec.setTitle(pt.getMime()); codec.setTitle(pt.getMime());
/* Special case */
if (pt.getMime().equals("mpeg4-generic")) {
if (android.os.Build.VERSION.SDK_INT < 16) {
/* Make sure AAC is disabled */
try {
lc.enablePayloadType(pt, false);
} catch (LinphoneCoreException e) {
e.printStackTrace();
}
continue;
} else {
codec.setTitle("AAC-ELD");
}
}
codec.setSummary(pt.getRate() + " Hz"); codec.setSummary(pt.getRate() + " Hz");
codec.setChecked(lc.isPayloadTypeEnabled(pt)); codec.setChecked(lc.isPayloadTypeEnabled(pt));
@ -639,7 +654,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
private void initCallSettings() { private void initCallSettings() {
CheckBoxPreference rfc2833 = (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key)); CheckBoxPreference rfc2833 = (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key));
CheckBoxPreference sipInfo = (CheckBoxPreference) findPreference(getString(R.string.pref_sipinfo_dtmf_key)); CheckBoxPreference sipInfo = (CheckBoxPreference) findPreference(getString(R.string.pref_sipinfo_dtmf_key));
if (mPrefs.useRfc2833Dtmfs()) { if (mPrefs.useRfc2833Dtmfs()) {
rfc2833.setChecked(true); rfc2833.setChecked(true);
sipInfo.setChecked(false); sipInfo.setChecked(false);
@ -649,7 +664,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
rfc2833.setChecked(false); rfc2833.setChecked(false);
rfc2833.setEnabled(false); rfc2833.setEnabled(false);
} }
setPreferenceDefaultValueAndSummary(R.string.pref_voice_mail_key, mPrefs.getVoiceMailUri()); setPreferenceDefaultValueAndSummary(R.string.pref_voice_mail_key, mPrefs.getVoiceMailUri());
} }
@ -676,7 +691,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
return true; return true;
} }
}); });
findPreference(getString(R.string.pref_sipinfo_dtmf_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { findPreference(getString(R.string.pref_sipinfo_dtmf_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 182d7989d8f4426c2a78e548647f00d57040c98a Subproject commit deaaf0a19b20f55ad258fb4a6b95a84af32146cc