Merge "New assets (wifi, bluetooth...)" into gingerbread
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d9b39fe..1094cf4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,6 +14,7 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="com.trustedlogic.trustednfc.permission.NFC_ADMIN" />
<uses-permission android:name="android.permission.HARDWARE_TEST" />
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e1ddeef..c724068 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Poskytovatel <xliff:g id="COMP_NAME">%1$s</xliff:g> se používá."</string>
<string name="language_settings" msgid="502219872342167227">"Jazyk a klávesnice"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nastavení jazyka a klávesnice"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Nastavení jazyka a oblasti, způsobu zadávání textu a automatických oprav"</string>
- <string name="language_category" msgid="3391756582724541530">"Nastavení národního prostředí"</string>
- <string name="text_category" msgid="6342540511465136739">"Nastavení textu"</string>
<string name="phone_language" msgid="1165758957501090679">"Vyberte jazyk"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Automatické nahrazování"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 119733e..6c237b8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Udbyderen <xliff:g id="COMP_NAME">%1$s</xliff:g> er i brug."</string>
<string name="language_settings" msgid="502219872342167227">"Sprog og tastatur"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Indstillinger for sprog og tastatur"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Angiv landestandard (sprog og område), tekstinput…"</string>
- <string name="language_category" msgid="3391756582724541530">"Indstilling af landestandard"</string>
- <string name="text_category" msgid="6342540511465136739">"Indstillinger for tekst"</string>
<string name="phone_language" msgid="1165758957501090679">"Vælg sprog"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatning"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d38990b..ba99f2c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Anbieter <xliff:g id="COMP_NAME">%1$s</xliff:g> wird verwendet."</string>
<string name="language_settings" msgid="502219872342167227">"Sprache & Tastatur"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Einstellungen für Sprache & Tastatur"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Optionen für Sprache und Region, Texteingabe und Autokorrektur festlegen"</string>
- <string name="language_category" msgid="3391756582724541530">"Ländereinstellung"</string>
- <string name="text_category" msgid="6342540511465136739">"Texteinstellungen"</string>
<string name="phone_language" msgid="1165758957501090679">"Sprache auswählen"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Autom. Ersetzung"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 379bbe9..c60d699 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Ο πάροχος <xliff:g id="COMP_NAME">%1$s</xliff:g> χρησιμοποιείται."</string>
<string name="language_settings" msgid="502219872342167227">"Γλώσσα και πληκτρολόγιο"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ρυθμίσεις γλώσσας και πληκτρολογίου"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Ορισμ.τοπ.ρυθμ.(γλώσσα και περιοχή), είσ.κειμ.και επιλ.αυτόμ.διόρθ."</string>
- <string name="language_category" msgid="3391756582724541530">"Τοπικές ρυθμίσεις"</string>
- <string name="text_category" msgid="6342540511465136739">"Ρυθμίσεις κειμένου"</string>
<string name="phone_language" msgid="1165758957501090679">"Επιλογή γλώσσας"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Αυτόματη αντικατάσταση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b6a0f75..520b4ef 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"El proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
<string name="language_settings" msgid="502219872342167227">"Idioma & del teclado"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Idioma y Configuración del teclado"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Establecer opciones de país (idioma y región), ingreso de texto y corrección automática"</string>
- <string name="language_category" msgid="3391756582724541530">"Configuración de país"</string>
- <string name="text_category" msgid="6342540511465136739">"Configuración de texto"</string>
<string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Reemplazar automát."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6a4e464..d893787 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
<string name="language_settings" msgid="502219872342167227">"Idioma y teclado"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ajustes de teclado y de idioma"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Configuración regional, opciones de autocorrección e introducción de texto"</string>
- <string name="language_category" msgid="3391756582724541530">"Configuración regional"</string>
- <string name="text_category" msgid="6342540511465136739">"Ajustes de texto"</string>
<string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2943e24..57eb44c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"L\'opérateur <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
<string name="language_settings" msgid="502219872342167227">"Langue et clavier"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Paramètres de langue et clavier"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Définir la langue et la région, la saisie de texte et la correction automatique"</string>
- <string name="language_category" msgid="3391756582724541530">"Paramètres régionaux"</string>
- <string name="text_category" msgid="6342540511465136739">"Paramètres du texte"</string>
<string name="phone_language" msgid="1165758957501090679">"Sélectionner la langue"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Remplacement auto"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index acaebf7..6465e6a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Il provider <xliff:g id="COMP_NAME">%1$s</xliff:g> è in uso."</string>
<string name="language_settings" msgid="502219872342167227">"Lingua e tastiera"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Impostazioni lingua e tastiera"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Impostazioni internazionali (lingua e regione), di inserimento e correzione automatica del testo"</string>
- <string name="language_category" msgid="3391756582724541530">"Impostazioni lingua"</string>
- <string name="text_category" msgid="6342540511465136739">"Impostazioni testo"</string>
<string name="phone_language" msgid="1165758957501090679">"Seleziona lingua"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Sostituzione automatica"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9fbabb5..d17a139 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"プロバイダ<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
<string name="language_settings" msgid="502219872342167227">"言語とキーボード"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"言語とキーボードの設定"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"言語と地域、文字入力の設定"</string>
- <string name="language_category" msgid="3391756582724541530">"地域/言語設定"</string>
- <string name="text_category" msgid="6342540511465136739">"文字入力設定"</string>
<string name="phone_language" msgid="1165758957501090679">"言語を選択"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"自動修正"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 65a04dc..eb499db 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"제공업체(<xliff:g id="COMP_NAME">%1$s</xliff:g>)를 사용 중입니다."</string>
<string name="language_settings" msgid="502219872342167227">"언어 및 키보드"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"언어 및 키보드 설정"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"로케일(언어 및 지역), 텍스트 입력 및 자동 수정 옵션 설정"</string>
- <string name="language_category" msgid="3391756582724541530">"로케일 설정"</string>
- <string name="text_category" msgid="6342540511465136739">"텍스트 설정"</string>
<string name="phone_language" msgid="1165758957501090679">"언어 선택"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"자동 바꾸기"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index fc63ed1..946b8a1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverandøren <xliff:g id="COMP_NAME">%1$s</xliff:g> er i bruk."</string>
<string name="language_settings" msgid="502219872342167227">"Språk og tastatur"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Språk og tastatur"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Innstillinger for språk, region, skriving av tekst og feilretting"</string>
- <string name="language_category" msgid="3391756582724541530">"Innstillinger for språk"</string>
- <string name="text_category" msgid="6342540511465136739">"Tekstinnstillinger"</string>
<string name="phone_language" msgid="1165758957501090679">"Velg språk"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatting"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 31e1b69..c725a25 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Provider <xliff:g id="COMP_NAME">%1$s</xliff:g> in gebruik."</string>
<string name="language_settings" msgid="502219872342167227">"Taal en toetsenbord"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Taal- en toetsenbordinstellingen"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Instellingen voor taal en regio, tekstinvoer en autocorrectieopties opgeven"</string>
- <string name="language_category" msgid="3391756582724541530">"Landinstelling"</string>
- <string name="text_category" msgid="6342540511465136739">"Tekstinstellingen"</string>
<string name="phone_language" msgid="1165758957501090679">"Taal selecteren"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Automatisch vervangen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 46f5cdc..3554ca4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Dostawca <xliff:g id="COMP_NAME">%1$s</xliff:g> jest w użyciu."</string>
<string name="language_settings" msgid="502219872342167227">"Język i klawiatura"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ustawienia języka i klawiatury"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Określ ustawienia regionalne (język i region) oraz opcje wprowadzania tekstu i autokorekty"</string>
- <string name="language_category" msgid="3391756582724541530">"Ustawienia regionalne"</string>
- <string name="text_category" msgid="6342540511465136739">"Ustawienia tekstu"</string>
<string name="phone_language" msgid="1165758957501090679">"Wybierz język"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Autokorekta"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 88aaf3c..7f3319a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"O fornecedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está a ser utilizado."</string>
<string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Definições de idioma e teclado"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Definir opções de região (idioma e região), entrada de texto e correcção automática"</string>
- <string name="language_category" msgid="3391756582724541530">"Definição de região"</string>
- <string name="text_category" msgid="6342540511465136739">"Definições de texto"</string>
<string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Substituir automaticamente"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 74dadcc..a65166c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"O provedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está em uso."</string>
<string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Configurações de idioma e teclado"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Definir opções de idioma e região, entrada de texto e correção automática"</string>
- <string name="language_category" msgid="3391756582724541530">"Configuração de local"</string>
- <string name="text_category" msgid="6342540511465136739">"Configurações de texto"</string>
<string name="phone_language" msgid="1165758957501090679">"Selecionar idioma"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Substituição automática"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3c7f6e2..c391a69 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Провайдер <xliff:g id="COMP_NAME">%1$s</xliff:g> используется."</string>
<string name="language_settings" msgid="502219872342167227">"Язык и клавиатура"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Настройки языка и клавиатуры"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Выбор языка и региона, способов ввода и настройка автокоррекции"</string>
- <string name="language_category" msgid="3391756582724541530">"Региональные настройки"</string>
- <string name="text_category" msgid="6342540511465136739">"Настройки ввода текста"</string>
<string name="phone_language" msgid="1165758957501090679">"Выбрать язык"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Автокоррекция"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e27e9ff..355458f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverantören <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
<string name="language_settings" msgid="502219872342167227">"Språk och tangentbord"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Inställningar för språk och tangentbord"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Ställ in alternativ för språkkod (land och område), textinmatning och autokorrigering"</string>
- <string name="language_category" msgid="3391756582724541530">"Språkkodsinställningar"</string>
- <string name="text_category" msgid="6342540511465136739">"Textinställningar"</string>
<string name="phone_language" msgid="1165758957501090679">"Välj språk"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Ersätt automatiskt"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f39a7ba..b6e98eb 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Sağlayıcı <xliff:g id="COMP_NAME">%1$s</xliff:g> kullanımda."</string>
<string name="language_settings" msgid="502219872342167227">"Dil ve klavye"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Dil ve klavye ayarları"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"Yer (dil ve bölge), metin girişi ve ot. düzeltme seçeneklerini ayarla"</string>
- <string name="language_category" msgid="3391756582724541530">"Yerel ayar"</string>
- <string name="text_category" msgid="6342540511465136739">"Metin ayarları"</string>
<string name="phone_language" msgid="1165758957501090679">"Dil seçin"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"Otomatik değiştir"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 93198a1..bd80746 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"正在使用提供商<xliff:g id="COMP_NAME">%1$s</xliff:g>。"</string>
<string name="language_settings" msgid="502219872342167227">"语言和键盘"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"语言和键盘设置"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"设置语言区域（语言和区域）、文字输入和自动更正选项"</string>
- <string name="language_category" msgid="3391756582724541530">"语言区域设置"</string>
- <string name="text_category" msgid="6342540511465136739">"文字设置"</string>
<string name="phone_language" msgid="1165758957501090679">"选择语言"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"自动替换"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 159da1e..df3555a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -775,9 +775,6 @@
<string name="process_provider_in_use_description" msgid="5586603325677678940">"供應商 <xliff:g id="COMP_NAME">%1$s</xliff:g> 正在使用中。"</string>
<string name="language_settings" msgid="502219872342167227">"語言與鍵盤"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"語言與鍵盤設定"</string>
- <string name="language_settings_summary" msgid="595647729475399987">"選取地區設定 (語言和地區)、文字輸入和自動校正選項"</string>
- <string name="language_category" msgid="3391756582724541530">"地區設定"</string>
- <string name="text_category" msgid="6342540511465136739">"文字設定"</string>
<string name="phone_language" msgid="1165758957501090679">"選取語言"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
<string name="auto_replace" msgid="6199184757891937822">"自動替換"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 208561e..6d9e294 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -85,11 +85,15 @@
<!-- Used for diagnostic info screens, precise translation isn't needed -->
<string name="radioInfo_cid">CID</string>
+ <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer [CHAR LIMIT=25] -->
+ <string name="sdcard_unmount" product="nosdcard">Unmount shared storage</string>
<!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer -->
- <string name="sdcard_unmount">Unmount SD card</string>
+ <string name="sdcard_unmount" product="default">Unmount SD card</string>
+ <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+ <string name="sdcard_format" product="nosdcard">Format shared storage</string>
<!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
- <string name="sdcard_format">Format SD card</string>
+ <string name="sdcard_format" product="default">Format SD card</string>
<!-- choice for the font size spinner -->
<string name="small_font">Small</string>
@@ -103,8 +107,10 @@
<!-- Button. Chosen when they want to save the chosen text size. -->
<string name="font_size_save">OK</string>
+ <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+ <string name="sdcard_setting" product="nosdcard">Shared storage</string>
<!-- Title for a notification shown. -->
- <string name="sdcard_setting">SD card</string>
+ <string name="sdcard_setting" product="default">SD card</string>
<!-- Battery Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
@@ -397,22 +403,34 @@
<string name="sdcard_settings_screen_mass_storage_text">Enable USB mass storage</string>
<!-- The label for total bytes on SD card -->
<string name="sdcard_settings_total_bytes_label">Total bytes:</string>
+ <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+ <string name="sdcard_settings_not_present_status" product="nosdcard">Shared storage not mounted</string>
<!-- Message when there is no SD card present -->
- <string name="sdcard_settings_not_present_status">No SD card</string>
+ <string name="sdcard_settings_not_present_status" product="default">No SD card</string>
<!-- Th label for the available (free) sapce on the SD card -->
<string name="sdcard_settings_available_bytes_label">Available bytes:</string>
+ <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+ <string name="sdcard_settings_mass_storage_status" product="nosdcard">Shared storage is being used as a mass storage device</string>
<!-- Message when the SD card is being used by the computer as mass storage -->
- <string name="sdcard_settings_mass_storage_status">SD card is being used as a mass storage device</string>
+ <string name="sdcard_settings_mass_storage_status" product="default">SD card is being used as a mass storage device</string>
+ <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+ <string name="sdcard_settings_unmounted_status" product="nosdcard">It is now safe to remove the shared storage</string>
<!-- Message when it is safe to remove the SD card -->
- <string name="sdcard_settings_unmounted_status">It is now safe to remove the SD card</string>
+ <string name="sdcard_settings_unmounted_status" product="default">It is now safe to remove the SD card</string>
+ <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+ <string name="sdcard_settings_bad_removal_status" product="nosdcard">Shared storage was removed while still in use!</string>
<!-- Error message when the SD card was removed without properly unmounting -->
- <string name="sdcard_settings_bad_removal_status">SD card was removed while still in use!</string>
+ <string name="sdcard_settings_bad_removal_status" product="default">SD card was removed while still in use!</string>
<!-- Label for used bytes on the SD card -->
<string name="sdcard_settings_used_bytes_label">Used bytes:</string>
+ <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30] -->
+ <string name="sdcard_settings_scanning_status" product="nosdcard">Scanning shared storage for media\u2026</string>
<!-- Message when it is scanning the SD card for new files -->
- <string name="sdcard_settings_scanning_status">Scanning SD card for media\u2026</string>
+ <string name="sdcard_settings_scanning_status" product="default">Scanning SD card for media\u2026</string>
+ <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+ <string name="sdcard_settings_read_only_status" product="nosdcard">Shared storage mounted read-only</string>
<!-- Message when the SD card is mounted as read only -->
- <string name="sdcard_settings_read_only_status">SD card mounted read-only</string>
+ <string name="sdcard_settings_read_only_status" product="default">SD card mounted read-only</string>
<!-- SetupWizard strings used by DateTimeSettingsSetupWizard. The button label for going to the next screen. -->
<string name="next_label">Next</string>
@@ -435,8 +453,10 @@
<string name="display_label">Display</string>
<!-- The title of the activity to see phone info -->
<string name="phone_info_label">Phone info</string>
+ <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+ <string name="sd_card_settings_label" product="nosdcard">Shared storage</string>
<!-- The title of the activity to adjust SD card settings-->
- <string name="sd_card_settings_label">SD card</string>
+ <string name="sd_card_settings_label" product="default">SD card</string>
<!-- The title of the activity to adjust proxy settings -->
<string name="proxy_settings_label">Proxy settings</string>
@@ -757,6 +777,12 @@
<!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again -->
<string name="bluetooth_dock_settings_remember">Remember settings</string>
+ <!-- NFC settings -->
+ <!-- Used in the 1st-level settings screen to turn on NFC -->
+ <string name="nfc_quick_toggle_title">NFC</string>
+ <!-- Used in the 1st-level settings screen as the turn-on summary -->
+ <string name="nfc_quick_toggle_summary">Turn on NFC</string>
+
<!-- Wi-Fi Settings --> <skip />
<!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
<string name="wifi_quick_toggle_title">Wi-Fi</string>
@@ -1209,12 +1235,18 @@
<string name="device_status">Status</string>
<!-- About phone screen, summary of the item to go into the phone status screen -->
<string name="device_status_summary">Phone number, signal, etc.</string>
+ <!-- Main settings screen item's title to go into the SD card and storage settings screen [CHAR LIMIT=25] -->
+ <string name="storage_settings" product="nosdcard">Shared & secure storage storage</string>
<!-- Main settings screen item's title to go into the SD card and storage settings screen-->
- <string name="storage_settings">SD card & phone storage</string>
+ <string name="storage_settings" product="default">SD card & phone storage</string>
+ <!-- SD card and storage settings screen title [CHAR LIMIT=25] -->
+ <string name="storage_settings_title" product="nosdcard">Shared & secure storage settings</string>
<!-- SD card and storage settings screen title -->
- <string name="storage_settings_title">SD card & phone storage settings</string>
+ <string name="storage_settings_title" product="default">SD card & phone storage settings</string>
<!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
- <string name="storage_settings_summary">Unmount SD card, view available storage</string>
+ <string name="storage_settings_summary" product="nosdcard">Unmount shared storage, view available storage</string>
+ <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+ <string name="storage_settings_summary" product="default">Unmount SD card, view available storage</string>
<!-- Do not translate. About phone, status item title -->
<string name="status_imei">IMEI</string>
<!-- Do not translate. About phone, status item title -->
@@ -1251,42 +1283,68 @@
<string name="status_awake_time">Awake time</string>
<!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage -->
<string name="internal_memory">Internal phone storage</string>
+ <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+ <string name="sd_memory" product="nosdcard">Shared storage</string>
<!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
- <string name="sd_memory">SD card</string>
+ <string name="sd_memory" product="default">SD card</string>
<!-- SD card & phone storage settings title. The amount of free space for some storage partition. For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
<string name="memory_available">Available space</string>
<!-- SD card & phone storage settings screen heading. The total amount of storage space for some storage partition. For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
<string name="memory_size">Total space</string>
+ <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. [CHAR LIMIT=25] -->
+ <string name="sd_eject" product="nosdcard">Unmount shared storage</string>
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. -->
- <string name="sd_eject">Unmount SD card</string>
+ <string name="sd_eject" product="default">Unmount SD card</string>
+ <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. [CHAR LIMIT=30] -->
+ <string name="sd_eject_summary" product="nosdcard">Unmount the shared storage so you can format it</string>
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. -->
- <string name="sd_eject_summary">Unmount the SD card for safe removal</string>
+ <string name="sd_eject_summary" product="default">Unmount the SD card for safe removal</string>
+ <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted. This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+ <string name="sd_insert_summary" product="nosdcard">Insert shared storage for mounting</string>
<!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
- <string name="sd_insert_summary">Insert an SD card for mounting</string>
+ <string name="sd_insert_summary" product="default">Insert an SD card for mounting</string>
+ <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. [CHAR LIMIT=25] -->
+ <string name="sd_mount" product="nosdcard">Mount shared storage</string>
<!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
- <string name="sd_mount">Mount SD card</string>
+ <string name="sd_mount" product="default">Mount SD card</string>
+ <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. [CHAR LIMIT=30] -->
+ <string name="sd_mount_summary" product="nosdcard">Mount the shared storage</string>
<!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
- <string name="sd_mount_summary">Mount the SD card</string>
+ <string name="sd_mount_summary" product="default">Mount the SD card</string>
+ <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card. [CHAR LIMIT=25] -->
+ <string name="sd_format" product="nosdcard">Format shared storage</string>
<!-- SD card & phone storage settings item title that will result in the phone formatting the SD card. -->
- <string name="sd_format">Format SD card</string>
+ <string name="sd_format" product="default">Format SD card</string>
+ <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. [CHAR LIMIT=30] -->
+ <string name="sd_format_summary" product="nosdcard">Format (erase) the shared storage</string>
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. -->
- <string name="sd_format_summary">Format (erase) the SD card</string>
+ <string name="sd_format_summary" product="default">Format (erase) the SD card</string>
<!-- SD card status when it is not available status -->
<string name="sd_unavailable">Unavailable</string>
<!-- SD card status when it is mounted as read only -->
<string name="read_only">\u0020(Read-only)</string>
+ <!-- SD card eject confirmation dialog title [CHAR LIMIT=25] -->
+ <string name="dlg_confirm_unmount_title" product="nosdcard">Unmount shared storage</string>
<!-- SD card eject confirmation dialog title -->
- <string name="dlg_confirm_unmount_title">Unmount SD card</string>
+ <string name="dlg_confirm_unmount_title" product="default">Unmount SD card</string>
+ <!-- SD card eject confirmation dialog [CHAR LIMIT=NONE] -->
+ <string name="dlg_confirm_unmount_text" product="nosdcard">If you unmount the shared storage, some applications you are using will stop and may be unavailable until you remount the shared storage.</string>
<!-- SD card eject confirmation dialog -->
- <string name="dlg_confirm_unmount_text">If you unmount the SD card, some applications you are using will stop and may be unavailable until you remount the SD card.</string>
+ <string name="dlg_confirm_unmount_text" product="default">If you unmount the SD card, some applications you are using will stop and may be unavailable until you remount the SD card.</string>
+ <!-- SD card eject error dialog title [CHAR LIMIT=30] -->
+ <string name="dlg_error_unmount_title" product="nosdcard">Unmounting shared storage failed</string>
<!-- SD card eject error dialog title -->
- <string name="dlg_error_unmount_title">Unmount SD card failed</string>
+ <string name="dlg_error_unmount_title" product="default">Unmount SD card failed</string>
+ <!-- SD card eject error dialog text [CHAR LIMIT=NONE] -->
+ <string name="dlg_error_unmount_text" product="nosdcard">Cannot unmount shared storage. Try again later.</string>
<!-- SD card eject error dialog text -->
- <string name="dlg_error_unmount_text">Cannot unmount SD card. Try again later.</string>
- <!-- SD card unmount informative text -->
- <string name="unmount_inform_text">SD card will be unmounted. Check the notification area for status.</string>
+ <string name="dlg_error_unmount_text" product="default">Cannot unmount SD card. Try again later.</string>
+ <!-- SD card unmount informative text [CHAR LIMIT=NONE] -->
+ <string name="unmount_inform_text" product="nosdcard">Shared storage will be unmounted.</string>
+ <!-- SD card unmount informative text [CHAR LIMIT=NONE] -->
+ <string name="unmount_inform_text" product="default">SD card will be unmounted.</string>
<!-- SD card eject progress title -->
<string name="sd_ejecting_title">Unmounting</string>
<!-- SD card eject progress text -->
@@ -1370,8 +1428,10 @@
<string name="master_clear_title">Factory data reset</string>
<!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
<string name="master_clear_summary">Erases all data on phone</string>
+ <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+ <string name="master_clear_desc" product="nosdcard">"This will erase all data from your phone, including:\n<li>Your Google account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications</li>\nIt will not erase:\n<li>Current system software and bundled applications</li>\n<li>Files in shared storage, such as music or photos</li>"</string>
<!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset -->
- <string name="master_clear_desc">"This will erase all data from your phone, including:\n<li>Your Google account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications</li>\nIt will not erase:\n<li>Current system software and bundled applications</li>\n<li>SD card files, such as music or photos</li>"</string>
+ <string name="master_clear_desc" product="default">"This will erase all data from your phone, including:\n<li>Your Google account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications</li>\nIt will not erase:\n<li>Current system software and bundled applications</li>\n<li>SD card files, such as music or photos</li>"</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
<string name="master_clear_button_text">Reset phone</string>
<!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
@@ -1386,22 +1446,34 @@
<string name="master_clear_failed">No reset was performed because the System Clear service is not available.</string>
<!-- Media Format -->
+ <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=25] -->
+ <string name="media_format_title" product="nosdcard">Format shared storage.</string>
<!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
- <string name="media_format_title">Format SD card.</string>
+ <string name="media_format_title" product="default">Format SD card.</string>
+ <!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading [CHAR LIMIT=30] -->
+ <string name="media_format_summary" product="nosdcard">Erases all data in shared storage</string>
<!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
- <string name="media_format_summary">Erases all data on the SD card</string>
- <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset -->
- <string name="media_format_desc">This action will erase the SD card in the phone. You will lose ALL data on the card!</string>
+ <string name="media_format_summary" product="default">Erases all data on the SD card</string>
+ <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+ <string name="media_format_desc" product="nosdcard">This action will erase the shared storage. You will lose ALL data in shared storage!</string>
+ <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+ <string name="media_format_desc" product="default">This action will erase the SD card. You will lose ALL data on the card!</string>
+ <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset [CHAR LIMIT=25] -->
+ <string name="media_format_button_text" product="nosdcard">Format shared storage</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
- <string name="media_format_button_text">Format SD card</string>
- <!-- SD card & phone storage settings screen, message on screen after user selects Format media button -->
- <string name="media_format_final_desc">Format SD card, erasing all your media? Action cannot be reversed!</string>
+ <string name="media_format_button_text" product="default">Format SD card</string>
+ <!-- SD card & phone storage settings screen, message on screen after user selects Format media button [CHAR LIMIT=NONE] -->
+ <string name="media_format_final_desc" product="nosdcard">Format shared storage, erasing all files stored there? Action cannot be reversed!</string>
+ <!-- SD card & phone storage settings screen, message on screen after user selects Format media button [CHAR LIMIT=NONE] -->
+ <string name="media_format_final_desc" product="default">Format SD card, erasing all files stored there? Action cannot be reversed!</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Format media button -->
<string name="media_format_final_button_text">Erase everything</string>
<!-- Message to draw an unlock pattern before clearing the device -->
<string name="media_format_gesture_prompt">Draw your unlock pattern</string>
- <!-- Explanation of drawing unlock pattern to format card -->
- <string name="media_format_gesture_explanation">You must draw your unlock pattern to confirm an SD card format.</string>
+ <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
+ <string name="media_format_gesture_explanation" product="nosdcard">You must draw your unlock pattern to confirm that you want to format the shared storage.</string>
+ <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
+ <string name="media_format_gesture_explanation" product="default">You must draw your unlock pattern to confirm that you want to format the SD card.</string>
<!-- Main settings screen, Call settings title for item to go into the call settings -->
<string name="call_settings_title">Call settings</string>
@@ -1683,8 +1755,11 @@
packages only. -->
<string name="filter_apps_running">Running</string>
<!-- Text for filter option in ManageApps screen to display list of
+ packages installed on sdcard. [CHAR LIMIT=30] -->
+ <string name="filter_apps_onsdcard" product="nosdcard">In shared storage</string>
+ <!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. -->
- <string name="filter_apps_onsdcard">On SD card</string>
+ <string name="filter_apps_onsdcard" product="default">On SD card</string>
<!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
<string name="disabled">Disabled</string>
<!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
@@ -1726,8 +1801,10 @@
<string name="move_app">Move</string>
<!-- Manage applications, text for Move button to move app to internal storage -->
<string name="move_app_to_internal">Move to phone</string>
+ <!-- Manage applications, text for Move button to move app to sdcard [CHAR LIMIT=25] -->
+ <string name="move_app_to_sdcard" product="nosdcard">Move to shared storage</string>
<!-- Manage applications, text for Move button to move app to sdcard -->
- <string name="move_app_to_sdcard">Move to SD card</string>
+ <string name="move_app_to_sdcard" product="default">Move to SD card</string>
<!-- Manage applications, title for dialog when killing persistent apps-->
<!-- Manage applications, text for Move button when move is in progress -->
<string name="moving">Moving</string>
@@ -1822,12 +1899,10 @@
<string name="language_settings">Language & keyboard</string>
<!-- Title of Language and keyboard settings screen -->
<string name="language_keyboard_settings_title">Language & keyboard settings</string>
- <!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings realted to locale and text -->
- <string name="language_settings_summary">Set locale (language and region), text input and auto-correction options</string>
- <!-- On Text & language settings screen, heading. Inside the "Locale & text" screen, this is the header for settings that are for locale changes. -->
- <string name="language_category">Locale setting</string>
- <!-- On Text & language settings screen, heading. Inside the "Locale & text" screen, this is the header for settings that relate to text (autotext, autoreplace, autocapitalization). -->
- <string name="text_category">Text settings</string>
+ <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+ <string name="language_settings_category">Language settings</string>
+ <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+ <string name="keyboard_settings_category">Keyboard settings</string>
<!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
<string name="phone_language">Select language</string>
<!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
@@ -2419,10 +2494,14 @@
<string name="credentials_unlock">Enter password</string>
<!-- Description of dialog to enable/dislable access to credential storage -->
<string name="credentials_unlock_hint">Enter the credential storage password.</string>
+ <!-- Title of preference to install certificates from SD card [CHAR LIMIT=25] -->
+ <string name="credentials_install_certificates" product="nosdcard">Install from shared storage</string>
<!-- Title of preference to install certificates from SD card -->
- <string name="credentials_install_certificates">Install from SD card</string>
+ <string name="credentials_install_certificates" product="default">Install from SD card</string>
+ <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=25] -->
+ <string name="credentials_install_certificates_summary" product="nosdcard">Install encrypted certificates from shared storage</string>
<!-- Summary of preference to install certificates from SD card -->
- <string name="credentials_install_certificates_summary">Install encrypted certificates from SD card</string>
+ <string name="credentials_install_certificates_summary" product="default">Install encrypted certificates from SD card</string>
<!-- Title of preference to set storage password -->
<string name="credentials_set_password">Set password</string>
<!-- Summary of preference to set storage password -->
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index d3c0e02..278100e 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -17,6 +17,9 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ <PreferenceCategory android:key="language_settings_category"
+ android:title="@string/language_settings_category" />
+
<PreferenceScreen
android:key="phone_language"
android:title="@string/phone_language">
@@ -25,8 +28,16 @@
android:targetClass="com.android.settings.LocalePicker"/>
</PreferenceScreen>
- <PreferenceCategory android:key="text_category"
- android:title="@string/text_category" />
+ <PreferenceScreen
+ android:title="@string/user_dict_settings_title"
+ android:summary="@string/user_dict_settings_summary">
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.UserDictionarySettings" />
+ </PreferenceScreen>
+
+ <PreferenceCategory android:key="keyboard_settings_category"
+ android:title="@string/keyboard_settings_category" />
<PreferenceScreen
android:key="hardkeyboard_category"
@@ -36,13 +47,5 @@
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.PhysicalKeyboardSettings"/>
</PreferenceScreen>
-
- <PreferenceScreen
- android:title="@string/user_dict_settings_title"
- android:summary="@string/user_dict_settings_summary">
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.UserDictionarySettings" />
- </PreferenceScreen>
</PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 7c91d50..9116b7f 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -41,6 +41,12 @@
</PreferenceScreen>
<CheckBoxPreference
+ android:key="toggle_nfc"
+ android:title="@string/nfc_quick_toggle_title"
+ android:summary="@string/nfc_quick_toggle_summary"
+ android:persistent="false" />
+
+ <CheckBoxPreference
android:key="toggle_bluetooth"
android:title="@string/bluetooth_quick_toggle_title"
android:summary="@string/bluetooth_quick_toggle_summary"
diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java
index 91d260c..8ab8a0c 100644
--- a/src/com/android/settings/LanguageSettings.java
+++ b/src/com/android/settings/LanguageSettings.java
@@ -44,6 +44,8 @@
public class LanguageSettings extends PreferenceActivity {
private static final String KEY_PHONE_LANGUAGE = "phone_language";
+ private static final String KEY_KEYBOARD_SETTINGS_CATEGORY = "keyboard_settings_category";
+ private static final String KEY_HARDKEYBOARD_CATEGORY = "hardkeyboard_category";
private boolean mHaveHardKeyboard;
private List<InputMethodInfo> mInputMethodProperties;
@@ -68,7 +70,7 @@
if (getAssets().getLocales().length == 1) {
getPreferenceScreen().
- removePreference(findPreference("language_category"));
+ removePreference(findPreference(KEY_PHONE_LANGUAGE));
} else {
mLanguagePref = findPreference(KEY_PHONE_LANGUAGE);
}
@@ -76,7 +78,7 @@
Configuration config = getResources().getConfiguration();
if (config.keyboard != Configuration.KEYBOARD_QWERTY) {
getPreferenceScreen().removePreference(
- getPreferenceScreen().findPreference("hardkeyboard_category"));
+ getPreferenceScreen().findPreference(KEY_HARDKEYBOARD_CATEGORY));
} else {
mHaveHardKeyboard = true;
}
@@ -97,7 +99,8 @@
mLastInputMethodId = Settings.Secure.getString(getContentResolver(),
Settings.Secure.DEFAULT_INPUT_METHOD);
- PreferenceGroup textCategory = (PreferenceGroup) findPreference("text_category");
+ PreferenceGroup keyboardSettingsCategory = (PreferenceGroup) findPreference(
+ KEY_KEYBOARD_SETTINGS_CATEGORY);
int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties
.size());
@@ -113,7 +116,7 @@
CheckBoxPreference chkbxPref = new CheckBoxPreference(this);
chkbxPref.setKey(prefKey);
chkbxPref.setTitle(label);
- textCategory.addPreference(chkbxPref);
+ keyboardSettingsCategory.addPreference(chkbxPref);
mCheckboxes.add(chkbxPref);
}
@@ -133,7 +136,7 @@
R.string.input_methods_settings_label_format, label);
prefScreen.setSummary(settingsLabel);
}
- textCategory.addPreference(prefScreen);
+ keyboardSettingsCategory.addPreference(prefScreen);
}
}
}
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 78cf8cf..4e60dba 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.ServiceManager;
import android.os.SystemProperties;
@@ -29,28 +28,30 @@
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.provider.Settings;
-import android.util.Log;
-
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.wifi.WifiEnabler;
+import com.android.settings.nfc.NfcEnabler;
public class WirelessSettings extends PreferenceActivity {
private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
private static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";
private static final String KEY_TOGGLE_WIFI = "toggle_wifi";
+ private static final String KEY_TOGGLE_NFC = "toggle_nfc";
private static final String KEY_WIFI_SETTINGS = "wifi_settings";
private static final String KEY_BT_SETTINGS = "bt_settings";
private static final String KEY_VPN_SETTINGS = "vpn_settings";
private static final String KEY_TETHER_SETTINGS = "tether_settings";
+
public static final String EXIT_ECM_RESULT = "exit_ecm_result";
public static final int REQUEST_CODE_EXIT_ECM = 1;
private AirplaneModeEnabler mAirplaneModeEnabler;
private CheckBoxPreference mAirplaneModePreference;
private WifiEnabler mWifiEnabler;
+ private NfcEnabler mNfcEnabler;
private BluetoothEnabler mBtEnabler;
/**
@@ -91,11 +92,13 @@
CheckBoxPreference airplane = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
CheckBoxPreference wifi = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI);
CheckBoxPreference bt = (CheckBoxPreference) findPreference(KEY_TOGGLE_BLUETOOTH);
+ CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
mAirplaneModeEnabler = new AirplaneModeEnabler(this, airplane);
mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
mWifiEnabler = new WifiEnabler(this, wifi);
mBtEnabler = new BluetoothEnabler(this, bt);
+ mNfcEnabler = new NfcEnabler(this, nfc);
String toggleable = Settings.System.getString(getContentResolver(),
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
@@ -113,9 +116,14 @@
findPreference(KEY_BT_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
}
- // Disable Bluetooth Settings if Bluetooth service is not available.
+ // Remove Bluetooth Settings if Bluetooth service is not available.
if (ServiceManager.getService(BluetoothAdapter.BLUETOOTH_SERVICE) == null) {
- findPreference(KEY_BT_SETTINGS).setEnabled(false);
+ getPreferenceScreen().removePreference(bt);
+ }
+
+ // Remove NFC if its not available
+ if (ServiceManager.getService(Context.NFC_SERVICE) == null) {
+ getPreferenceScreen().removePreference(nfc);
}
// Disable Tethering if it's not allowed
@@ -145,21 +153,23 @@
@Override
protected void onResume() {
super.onResume();
-
+
mAirplaneModeEnabler.resume();
mWifiEnabler.resume();
mBtEnabler.resume();
+ mNfcEnabler.resume();
}
-
+
@Override
protected void onPause() {
super.onPause();
-
+
mAirplaneModeEnabler.pause();
mWifiEnabler.pause();
mBtEnabler.pause();
+ mNfcEnabler.pause();
}
-
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_EXIT_ECM) {
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
new file mode 100644
index 0000000..8bd9654
--- /dev/null
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.nfc;
+
+import com.android.settings.R;
+import com.trustedlogic.trustednfc.android.NfcException;
+import com.trustedlogic.trustednfc.android.NfcManager;
+import android.content.Context;
+import android.preference.Preference;
+import android.preference.CheckBoxPreference;
+import android.provider.Settings;
+import android.util.Log;
+
+/**
+ * NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It is
+ * turns on/off Nfc and ensures the summary of the preference reflects the
+ * current state.
+ */
+public class NfcEnabler implements Preference.OnPreferenceChangeListener {
+ private static final String TAG = "NfcEnabler";
+
+ private final Context mContext;
+ private final CheckBoxPreference mCheckbox;
+ private final NfcManager mNfcManager;
+
+ private boolean mNfcState;
+
+ public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) {
+ mContext = context;
+ mCheckbox = checkBoxPreference;
+ mNfcManager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);
+
+ if (mNfcManager == null) {
+ // NFC is not supported
+ mCheckbox.setEnabled(false);
+ }
+ }
+
+ public void resume() {
+ if (mNfcManager == null) {
+ return;
+ }
+ mCheckbox.setOnPreferenceChangeListener(this);
+ mNfcState = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NFC_ON, 0) != 0;
+ updateUi();
+ }
+
+ public void pause() {
+ if (mNfcManager == null) {
+ return;
+ }
+ mCheckbox.setOnPreferenceChangeListener(null);
+ }
+
+ public boolean onPreferenceChange(Preference preference, Object value) {
+ // Turn on/off Nfc
+ mNfcState = (Boolean) value;
+ setEnabled();
+
+ return false;
+ }
+
+ private void setEnabled() {
+ if (mNfcState) {
+ try {
+ mNfcManager.enable();
+ } catch (NfcException e) {
+ Log.w(TAG, "NFC enabling failed: " + e.getMessage());
+ mNfcState = false;
+ }
+
+ } else {
+ try {
+ mNfcManager.disable();
+ } catch (NfcException e) {
+ Log.w(TAG, "NFC disabling failed: " + e.getMessage());
+ mNfcState = true;
+ }
+ }
+ updateUi();
+ }
+
+ private void updateUi() {
+ mCheckbox.setChecked(mNfcState);
+ if (mNfcState) {
+ mCheckbox.setSummary(R.string.nfc_quick_toggle_summary);
+ } else {
+ mCheckbox.setSummary("");
+ }
+ }
+}
\ No newline at end of file