From 6259fc0d0ba29e5cef349ae69ace9f588e726b00 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@linphone.org>
Date: Thu, 22 Sep 2011 09:08:27 +0200
Subject: [PATCH] G722 added in preferences

---
 res/values/non_localizable_strings.xml | 1 +
 res/values/strings.xml                 | 1 +
 res/xml/preferences.xml                | 3 +++
 src/org/linphone/LinphoneManager.java  | 1 +
 4 files changed, 6 insertions(+)

diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 5e56a0ee6..082eb68c6 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -36,6 +36,7 @@
     <string name="pref_codec_pcma_key">pref_codec_pcma_key</string>
     <string name="pref_codec_pcmu_key">pref_codec_pcmu_key</string>
     <string name="pref_codec_gsm_key">pref_codec_gsm_key</string>
+    <string name="pref_codec_g722_key">pref_codec_g722_key</string>
     <string name="pref_codec_amr_key">pref_codec_amr_key</string>
     <string name="pref_codec_ilbc_key">pref_codec_ilbc_key</string>
     <string name="pref_codec_speex8_key">pref_codec_speex8_key</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a45e1374a..602a9f54a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -66,6 +66,7 @@
     <string name="pref_codec_pcma">pcma</string>
     <string name="pref_codec_pcmu">pcmu</string>
     <string name="pref_codec_gsm">gsm</string>
+    <string name="pref_codec_g722">g722</string>
     <string name="pref_codec_amr">amr</string>
     <string name="pref_codec_ilbc">ilbc</string>
     <string name="pref_codec_speex8">speex 8 Khz</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c30a6c3ea..f17a6bb6f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -63,6 +63,9 @@
 				android:shouldDisableView="true"  />
 		 	<CheckBoxPreference android:key="@string/pref_codec_gsm_key"
 				android:title="@string/pref_codec_gsm"/>
+			<CheckBoxPreference android:key="@string/pref_codec_g722_key"
+				android:defaultValue="false"
+				android:title="@string/pref_codec_g722"/>
 			<CheckBoxPreference android:key="@string/pref_codec_pcmu_key"
 				android:title="@string/pref_codec_pcmu"/>
 			<CheckBoxPreference android:key="@string/pref_codec_pcma_key"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 0b17badca..b99fd67ed 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -434,6 +434,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			enableDisableAudioCodec("speex", 8000, R.string.pref_codec_speex8_key);
 			enableDisableAudioCodec("iLBC", 8000, R.string.pref_codec_ilbc_key);
 			enableDisableAudioCodec("GSM", 8000, R.string.pref_codec_gsm_key);
+			enableDisableAudioCodec("G722", 8000, R.string.pref_codec_g722_key);
 			enableDisableAudioCodec("PCMU", 8000, R.string.pref_codec_pcmu_key);
 			enableDisableAudioCodec("PCMA", 8000, R.string.pref_codec_pcma_key);
 			enableDisableAudioCodec("AMR", 8000, R.string.pref_codec_amr_key);