From ec53982b3efaa54c016cc3397fa687a16eea9531 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 31 Oct 2011 16:27:38 +0100
Subject: [PATCH] remove silk/8000 and silk/12000

---
 res/xml/preferences.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index b018cb393..74deef9a6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -47,8 +47,7 @@
 		<CheckBoxPreference android:key="@string/pref_echo_canceller_calibration_key"
 		 android:title="@string/pref_echo_canceller_calibration" />
 		 
-		 <PreferenceScreen android:title="@string/pref_codecs"
-			android:key="@string/pref_codecs_key">
+		 <PreferenceScreen android:title="@string/pref_codecs" android:key="@string/pref_codecs_key">
 			<CheckBoxPreference android:key="@string/pref_codec_speex16_key"
 				android:title="@string/pref_codec_speex16"/>
 			<CheckBoxPreference android:key="@string/pref_codec_speex8_key"
@@ -68,12 +67,8 @@
 				android:title="@string/pref_codec_g722"/>
 			<CheckBoxPreference android:key="@string/pref_codec_silk24_key"
 				android:title="@string/pref_codec_silk24"/>
-			<CheckBoxPreference android:key="@string/pref_codec_silk16_key"
-				android:title="@string/pref_codec_silk16"/>
-			<CheckBoxPreference android:key="@string/pref_codec_silk12_key"
-				android:title="@string/pref_codec_silk12" android:shouldDisableView="true"/>
-			<CheckBoxPreference android:key="@string/pref_codec_silk8_key"
-				android:title="@string/pref_codec_silk8" android:shouldDisableView="true"/>
+			<CheckBoxPreference android:key="@string/pref_codec_silk16_key" 
+			android:title="@string/pref_codec_silk16"/>
 			<CheckBoxPreference android:key="@string/pref_codec_pcmu_key"
 				android:title="@string/pref_codec_pcmu"/>
 			<CheckBoxPreference android:key="@string/pref_codec_pcma_key"