From 520e16a5141dea351c1923a629b84dbea5c79f2c Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 21 Jan 2016 10:33:28 +0100
Subject: [PATCH] pref: remove qos algorithm choice

---
 res/values/non_localizable_strings.xml |  3 ---
 res/xml/preferences.xml                | 10 ++--------
 src/org/linphone/SettingsFragment.java | 20 +++-----------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index aeb580684..2a3a3b75b 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -102,9 +102,6 @@
 	<string name="pref_background_mode_key">pref_background_mode_key</string>
 	<string name="pref_codec_bitrate_limit_key">pref_codec_bitrate_limit_key</string>
 	<string name="pref_adaptive_rate_control_key">pref_adaptive_rate_control_key</string>
-	<string name="pref_adaptive_rate_algorithm_key">pref_adaptive_rate_algorithm</string>
-	<string name="pref_adaptive_rate_algorithm_simple_key">pref_adaptive_rate_algorithm_simple_key</string>
-	<string name="pref_adaptive_rate_algorithm_stateful_key">pref_adaptive_rate_algorithm_stateful_key</string>
 
 	<string name="push_reg_id_key">push_reg_id_key</string>
 	<string name="push_sender_id_key">push_sender_id_key</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index bf59a9549..544eb39af 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -4,7 +4,7 @@
     <PreferenceCategory
         android:title="@string/pref_sipaccounts"
 	    android:key="@string/pref_sipaccounts_key"/>
-	
+
 	<Preference
 	    android:title="@string/pref_add_account"
 	    android:key="@string/pref_add_account_key"/>
@@ -53,12 +53,6 @@
 				android:title="@string/pref_adaptive_rate_control"
 			    android:key="@string/pref_adaptive_rate_control_key" />
 
-			<ListPreference
-			    android:title="@string/pref_adaptive_rate_algorithm"
-				android:key="@string/pref_adaptive_rate_algorithm_key"
-				android:entries="@array/adaptive_rate_algorithm_entries"
-            	android:entryValues="@array/adaptive_rate_algorithm_entries" />
-
 			<ListPreference
 			    android:title="@string/pref_codec_bitrate_limit"
 				android:key="@string/pref_codec_bitrate_limit_key"
@@ -132,7 +126,7 @@
 			<CheckBoxPreference
 				android:title="@string/pref_rfc2833_dtmf"
 			    android:key="@string/pref_rfc2833_dtmf_key"/>
-			
+
 			<EditTextPreference
 			    android:title="@string/pref_voice_mail"
 				android:key="@string/pref_voice_mail_key"/>
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 006a9ee25..dd0627726 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -69,12 +69,12 @@ public class SettingsFragment extends PreferencesListFragment {
 		initSettings();
 		setListeners();
 		hideSettings();
-		
+
 		mListener = new LinphoneCoreListenerBase(){
 			@Override
 			public void ecCalibrationStatus(LinphoneCore lc, final EcCalibratorStatus status, final int delayMs, Object data) {
 				LinphoneManager.getInstance().routeAudioToReceiver();
-				
+
 				CheckBoxPreference echoCancellation = (CheckBoxPreference) findPreference(getString(R.string.pref_echo_cancellation_key));
 				Preference echoCancellerCalibration = findPreference(getString(R.string.pref_echo_canceller_calibration_key));
 
@@ -480,10 +480,6 @@ public class SettingsFragment extends PreferencesListFragment {
 		CheckBoxPreference adaptiveRateControl = (CheckBoxPreference) findPreference(getString(R.string.pref_adaptive_rate_control_key));
 		adaptiveRateControl.setChecked(mPrefs.isAdaptiveRateControlEnabled());
 
-		ListPreference adaptiveRateAlgorithm = (ListPreference) findPreference(getString(R.string.pref_adaptive_rate_algorithm_key));
-		adaptiveRateAlgorithm.setSummary(String.valueOf(mPrefs.getAdaptiveRateAlgorithm()));
-		adaptiveRateAlgorithm.setValue(String.valueOf(mPrefs.getAdaptiveRateAlgorithm()));
-
 		ListPreference bitrateLimit = (ListPreference) findPreference(getString(R.string.pref_codec_bitrate_limit_key));
 		bitrateLimit.setSummary(String.valueOf(mPrefs.getCodecBitrateLimit()));
 		bitrateLimit.setValue(String.valueOf(mPrefs.getCodecBitrateLimit()));
@@ -508,16 +504,6 @@ public class SettingsFragment extends PreferencesListFragment {
 			}
 		});
 
-		findPreference(getString(R.string.pref_adaptive_rate_algorithm_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-			@Override
-			public boolean onPreferenceChange(Preference preference, Object newValue) {
-				mPrefs.setAdaptiveRateAlgorithm(AdaptiveRateAlgorithm.fromString((String) newValue));
-				preference.setSummary(String.valueOf(mPrefs.getAdaptiveRateAlgorithm()));
-				return true;
-			}
-		});
-
-
 		findPreference(getString(R.string.pref_codec_bitrate_limit_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -982,7 +968,7 @@ public class SettingsFragment extends PreferencesListFragment {
 			}
 		});
 	}
-	
+
 	@Override
 	public void onResume() {
 		super.onResume();