From 8e49b5af6ff6616cec8f5f379b77852331d593f5 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 9 Jul 2010 16:22:24 +0200
Subject: [PATCH] Add notice for iLBC unavailability and echo canceller.

---
 res/values/strings.xml  | 3 ++-
 res/xml/preferences.xml | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6864e431d..51f041649 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_ilbc_summary">ILBC codec might be unavailable on some phone models.</string>
+    <string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
     <string name="pref_echo_cancellation">Echo cancellation</string>
     <string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>
     <string name="pref_handle_outcall_summarry">If set cellular call are redirected to voip when possible</string>
@@ -63,4 +63,5 @@
 <string name="notification_registered">registered to %s </string> 
 <string name="notification_register_failure">fails to register to %s</string>
 <string name="notification_started">started</string>
+<string name="pref_echo_cancellation_summary">Removes the echo heared by the other end.</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 218bffe1e..e61a148bc 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -16,9 +16,8 @@
 			<CheckBoxPreference android:key="@string/pref_codec_speex16_key"
 				android:title="@string/pref_codec_speex16" android:defaultValue="true"></CheckBoxPreference>
 			<CheckBoxPreference android:key="@string/pref_codec_speex8_key"
-				android:title="@string/pref_codec_speex8" android:defaultValue="true"></CheckBoxPreference><CheckBoxPreference android:key="@string/pref_codec_ilbc_key" android:title="@string/pref_codec_ilbc" android:enabled="false" android:shouldDisableView="true" android:defaultValue="true"></CheckBoxPreference>
-			<!--  CheckBoxPreference android:key="@string/pref_codec_ilbc_key"
-				android:title="@string/pref_codec_ilbc" android:enabled="true"></CheckBoxPreference-->								
+				android:title="@string/pref_codec_speex8" android:defaultValue="true"></CheckBoxPreference>
+			<CheckBoxPreference android:key="@string/pref_codec_ilbc_key" android:title="@string/pref_codec_ilbc" android:enabled="false" android:shouldDisableView="true" android:defaultValue="true" android:summary="@string/pref_ilbc_summary"></CheckBoxPreference>								
 			<CheckBoxPreference android:key="@string/pref_codec_gsm_key"
 				android:title="@string/pref_codec_gsm" android:defaultValue="true"></CheckBoxPreference>								
 			<CheckBoxPreference android:key="@string/pref_codec_pcmu_key"
@@ -26,7 +25,7 @@
 			<CheckBoxPreference android:key="@string/pref_codec_pcma_key"
 				android:title="@string/pref_codec_pcma" android:defaultValue="true"></CheckBoxPreference>								
 		</PreferenceScreen><CheckBoxPreference android:title="@string/pref_autostart" android:key="@string/pref_autostart_key" android:defaultValue="false"></CheckBoxPreference>
-		<CheckBoxPreference android:title="@string/pref_handle_outcall" android:key="@string/pref_handle_outcall_key" android:summary="@string/pref_handle_outcall_summarry"></CheckBoxPreference><CheckBoxPreference android:key="@string/pref_echo_cancellation_key" android:title="@string/pref_echo_cancellation"></CheckBoxPreference><EditTextPreference android:title="@string/pref_prefix"
+		<CheckBoxPreference android:title="@string/pref_handle_outcall" android:key="@string/pref_handle_outcall_key" android:summary="@string/pref_handle_outcall_summarry"></CheckBoxPreference><CheckBoxPreference android:key="@string/pref_echo_cancellation_key" android:title="@string/pref_echo_cancellation" android:summary="@string/pref_echo_cancellation_summary"></CheckBoxPreference><EditTextPreference android:title="@string/pref_prefix"
 			android:key="@string/pref_prefix_key"></EditTextPreference>
 
 		<CheckBoxPreference android:key="@string/pref_debug_key"