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

Echo cancel calibration preference is no longer a checkbox

Browse source
This commit is contained in:
Sylvain Berfini 2012-10-15 11:46:40 +02:00
parent d5433a1944
commit 83f77ea4f9
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/xml/preferences.xml
View file

@ -76,7 +76,7 @@
android:title="@string/pref_echo_cancellation" android:title="@string/pref_echo_cancellation"
android:summary="@string/pref_echo_cancellation_summary"/> android:summary="@string/pref_echo_cancellation_summary"/>
<CheckBoxPreference <Preference
android:key="@string/pref_echo_canceller_calibration_key" android:key="@string/pref_echo_canceller_calibration_key"
android:title="@string/pref_echo_canceller_calibration" /> android:title="@string/pref_echo_canceller_calibration" />

8
src/org/linphone/PreferencesFragment.java
View file

@ -64,7 +64,7 @@ import android.preference.PreferenceScreen;
public class PreferencesFragment extends PreferencesListFragment implements EcCalibrationListener { public class PreferencesFragment extends PreferencesListFragment implements EcCalibrationListener {
private Handler mHandler = new Handler(); private Handler mHandler = new Handler();
private Context mContext; private Context mContext;
private CheckBoxPreference ecCalibratePref; private Preference ecCalibratePref;
private CheckBoxPreference elPref; private CheckBoxPreference elPref;
private CheckBoxPreference ecPref; private CheckBoxPreference ecPref;
private ListPreference mencPref; private ListPreference mencPref;
@ -113,7 +113,7 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
addTransportChecboxesListener(); addTransportChecboxesListener();
ecCalibratePref = (CheckBoxPreference) findPreference(pref_echo_canceller_calibration_key); ecCalibratePref = findPreference(pref_echo_canceller_calibration_key);
ecCalibratePref.setOnPreferenceClickListener(new OnPreferenceClickListener() { ecCalibratePref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
startEcCalibration(); startEcCalibration();
@ -304,16 +304,12 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
} }
public void onEcCalibrationStatus(final EcCalibratorStatus status, final int delayMs) { public void onEcCalibrationStatus(final EcCalibratorStatus status, final int delayMs) {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
public void run() { public void run() {
if (status == EcCalibratorStatus.Done) { if (status == EcCalibratorStatus.Done) {
ecCalibratePref.setSummary(String.format(getString(R.string.ec_calibrated), delayMs)); ecCalibratePref.setSummary(String.format(getString(R.string.ec_calibrated), delayMs));
ecCalibratePref.setChecked(true);
} else if (status == EcCalibratorStatus.Failed) { } else if (status == EcCalibratorStatus.Failed) {
ecCalibratePref.setSummary(R.string.failed); ecCalibratePref.setSummary(R.string.failed);
ecCalibratePref.setChecked(false);
elPref.setChecked(true); elPref.setChecked(true);
ecPref.setChecked(false); ecPref.setChecked(false);
} }