am fced1268: Fix bug 2577511 NPE in TTS Settings A previous bug had caused incorrect settings to be saved, in particular the default language variant was not stored, unlike the default language and country. When settings were restored, this caused an invalid group of
Merge commit 'fced126829a74c9cbe9cbe993a3c54d1ff015a73' into kraken
* commit 'fced126829a74c9cbe9cbe993a3c54d1ff015a73':
Fix bug 2577511 NPE in TTS Settings
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 42ac27a..3bdcdef 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Úložiště pověření je vymazáno."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Úložiště pověření je deaktivováno."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Systém souborů EFS (Encrypted File System)"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifrovat soukromá uživatelská data"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktivovat v tomto zařízení úložiště pro soukromá uživatelská data, které využívá šifrovaný systém souborů "</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivace systému souborů EFS vyžaduje vymazání dat ze zařízení."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Deaktivace systému souborů EFS vyžaduje vymazání dat ze zařízení."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Povolit"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Vypnout"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Zrušit"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Změna režimu systému souborů EFS byla zrušena."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Upozornění systému souborů EFS."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Ochrana osobních údajů"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6ef8579..4947cf8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Oplysningslagringen er slettet."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Oplysningslagring er aktiveret."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Oplysningslagring er deaktiveret."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Krypteret filsystem"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Krypter private brugerdata"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktiver krypteret filsystemlager for private brugerdata på denne enhed"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivering af krypterede filsystemer kræver en enhedsdatasletter."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Deaktivering af krypterede filsystemer kræver en enhedsdatasletter."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktivér"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Deaktiver"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annuller"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Ændring af tilstand for krypterede filsystemer blev anulleret."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advarsel for krypterede filsystemer."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Fortrolighed"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f4073bb..a3a265a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Der Speicher für die Anmeldeinformationen wurde gelöscht."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Der Anmeldeinformationsspeicher ist deaktiviert."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Encrypted File System"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Private Nutzerdaten verschlüsseln"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Encrypted File System-Speicherung für private Nutzerdaten auf diesem Gerät aktivieren"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Für das Aktivieren von Encrypted File Systems müssen die Gerätedaten zurückgesetzt werden."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Für das Deaktivieren von Encrypted File Systems müssen die Gerätedaten zurückgesetzt werden."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktivieren"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Deaktivieren"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Abbrechen"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Encrypted File Systems-Modusänderung abgebrochen"</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Encrypted File Systems-Warnung"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Datenschutz"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 67529e5..2bec3f7 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Αυτός ο χώρος αποθήκευσης διαπιστευτηρίων διαγράφτηκε."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Ο χώρος αποθήκευσης διαπιστευτηρίων ενεργοποιήθηκε."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Ο χώρος αποθήκευσης διαπιστευτηρίων απενεργοποιήθηκε."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Κρυπτογραφημένο σύστημα αρχείων"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Κρυπτογράφηση ιδιωτικών δεδομένων χρήστη"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Ενεργοποίηση αποθήκευσης κρυπτογραφημένου συστήματος αρχείων για ιδιωτικά δεδομένα χρήστη σε αυτήν τη συσκευή"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Για την ενεργοποίηση των κρυπτογραφημένων συστημάτων αρχείων απαιτείται σβήσιμο των δεδομένων συσκευής."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Για την απενεργοποίηση των κρυπτογραφημένων συστημάτων αρχείων απαιτείται σβήσιμο των δεδομένων συσκευής."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Ενεργοποίηση"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Απενεργοποίηση"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Ακύρωση"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Η αλλαγή λειτουργίας κρυπτογραφημένων συστημάτων αρχείων ακυρώθηκε."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Προειδοποίηση κρυπτογραφημένων συστημάτων αρχείων."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Απόρρητο"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1a9e91d..c409026 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"El almacenamiento de la credencial se ha borrado."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de la credencial está activado."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"El almacenamiento de la credencial está inhabilitado."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de encriptado de archivos"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encriptar los datos privados del usuario"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Habilitar el almacenamiento del sistema de encriptado de archivos para los datos privados del usuario en este dispositivo"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Si se habilitan los sistemas de encriptado de archivos, se requiere la eliminación de datos del dispositivo."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Si se deshabilitan los sistemas de encriptado de archivos, se requiere la eliminación de datos del dispositivo."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activar"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Desactivar"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Cambio en el modo de sistemas de encriptado de archivos cancelado"</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advertencia de los sistemas de encriptado de archivos."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Privacidad"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 109fe7a..ae3bcab 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Se ha borrado el almacenamiento de credenciales."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Almacenamiento de credenciales inhabilitado"</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de archivos encriptados"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encriptar datos de usuario privados"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Habilitar almacenamiento de sistema de archivos encriptados para datos de usuario privados en este dispositivo"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Es necesario eliminar los datos del dispositivo para habilitar los sistemas de archivos encriptados."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Es necesario eliminar los datos del dispositivo para inhabilitar los sistemas de archivos encriptados."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Habilitar"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Inhabilitar"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Se ha cancelado el cambio de modo de sistemas de archivos encriptados."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advertencia de sistemas de archivos encriptados"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Privacidad"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 91eeb36..d182d3d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Le stockage des identifiants est effacé."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Stockage des identifiants désactivé"</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Système de fichiers cryptés"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Crypter les données utilisateur privées"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Activer le stockage des données utilisateur privées dans les systèmes de fichiers cryptés de ce périphérique"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Pour activer les systèmes de fichiers cryptés, vous devez disposer d\'un outil de nettoyage des données."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Pour désactiver des systèmes de fichiers cryptés, vous devez disposer d\'un outil de nettoyage des données."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activer"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Désactiver"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annuler"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"La modification apportée au mode Systèmes de fichiers cryptés a été annulée."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avertissement relatif aux systèmes de fichiers cryptés"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Confidentialité"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a814435..b4c0e11 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"L\'archivio di credenziali è cancellato."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"L\'archivio di credenziali non è attivo."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"File system crittografato"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Crittografa dati privati utente"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Abilita l\'archiviazione dei file system crittografati per i dati privati dell\'utente in questo dispositivo"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Per l\'attivazione dei file system crittografati è necessaria la cancellazione dei dati del dispositivo."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Per la disattivazione dei file system crittografati è necessaria la cancellazione dei dati del dispositivo."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Attiva"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Disattiva"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annulla"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Modifica della modalità dei file system crittografati annullata."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avviso file system crittografati."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate di emergenza"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c04757e..b322921 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1082,6 +1082,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"認証情報ストレージが消去されました。"</string>
<string name="credentials_enabled" msgid="7588607413349978930">"認証情報ストレージが有効になりました。"</string>
<string name="credentials_disabled" msgid="7453188089059045380">"認証情報ストレージが無効になりました。"</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"暗号化ファイルシステム"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"個人データの暗号化"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"この携帯電話の個人データを格納するために暗号化ファイルシステムを有効にする"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"暗号化ファイルシステムを有効にするには、携帯電話データの消去が必要です。"</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"暗号化ファイルシステムを無効にするには、携帯電話データの消去が必要です。"</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"有効にする"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"無効にする"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"キャンセル"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"暗号化ファイルシステムのモードの変更がキャンセルされました。"</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"暗号化ファイルシステムの警告。"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
<string name="privacy_settings" msgid="9206631214140954954">"プライバシー"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5888abe..83081df 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"자격증명 저장소가 삭제되었습니다."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"자격증명 저장소를 사용합니다."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"자격증명 저장소를 사용 중지했습니다."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"암호화된 파일 시스템"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"비공개 사용자 데이터 암호화"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"기기의 비공개 사용자 데이터에 대해 암호화된 파일 시스템 저장소 사용"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"암호화된 파일 시스템을 사용하려면 기기 데이터를 지워야 합니다."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"암호화된 파일 시스템의 사용을 중지하려면 기기 데이터를 지워야 합니다."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"사용"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"사용 중지"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"취소"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"암호화된 파일 시스템 모드 변경이 취소되었습니다."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"암호화된 파일 시스템 경고"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
<string name="privacy_settings" msgid="9206631214140954954">"개인정보 보호"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5872edd..69e6291 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Akkreditivlageret ble tømt."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Akkreditivlageret er aktivert."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Akkreditivlageret er deaktivert."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Kryptert filsystem"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Krypter private brukerdata"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktiver lagring av krypterte filer for private brukerdata på denne enheten"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivering av krypterte filsystemer krever en fullstendig datarensing."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Deaktivering av krypterte filsystemer krever en fullstendig datarensing."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktiver"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Deaktiver"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Avbryt"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Endring av modus for kryptert filsystem er avbrutt."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advarsel om kryptert filsystem."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Velg oppførsel når en nødsamtale opprettes"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Personvern"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2e2ffcd..bdcddc2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1081,6 +1081,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"De opslag van referenties is gewist."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"De opslag van referenties is ingeschakeld."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"De opslag van referenties is uitgeschakeld."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Gecodeerde bestandssysteem"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Persoonlijke gebruikersgegevens coderen"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Gecodeerde bestandssysteemopslag voor persoonlijke gebruikersgegevens inschakelen op dit apparaat"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Voor het inschakelen van gecodeerde bestandssystemen is het wissen van apparaatgegevens vereist."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Voor het uitschakelen van gecodeerde bestandssystemen is het wissen van apparaatgegevens vereist."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Inschakelen"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Uitschakelen"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annuleren"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Het wijzigen van de gecodeerde bestandssysteemmodus is geannuleerd."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Waarschuwing voor gecodeerde bestandssystemen."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 913f8d6..b366463 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Magazyn danych uwierzytelniania został wyczyszczony."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Magazyn danych logowania jest wyłączony."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"System szyfrowania plików"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Zaszyfruj prywatne dane użytkownika"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Włącz magazyn zaszyfrowanego systemu plików na potrzeby prywatnych danych użytkownika na tym urządzeniu"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Włączenie systemów szyfrowania plików wymaga wymazania danych urządzenia."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Wyłączenie systemów szyfrowania plików wymaga wymazania danych urządzenia."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Włącz"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Wyłącz"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Anuluj"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Zmiana trybu systemów szyfrowania plików została anulowana."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Ostrzeżenie dotyczące systemów szyfrowania plików"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Prywatność"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e97b4fd..392dd6a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"O armazenamento de credenciais foi apagado."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"O armazenamento de credenciais está desactivado."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de ficheiros encriptados"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encriptar dados de utilizador privados"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Activar armazenamento do sistema de ficheiros encriptados para dados de utilizador privados neste dispositivo"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"A activação dos Sistemas de ficheiros encriptados requer uma limpeza de dados do dispositivo."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"A desactivação dos Sistemas de ficheiros encriptados requer uma limpeza de dados do dispositivo."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activar"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Desactivar"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"A alteração do modo Sistemas de ficheiros encriptados foi cancelada."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Aviso dos Sistemas de ficheiros encriptados."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efectuada uma chamada de emergência"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Privacidade"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9f0df78..bbad1f2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"O armazenamento de credenciais foi apagado."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais foi ativado."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"O armazenamento de credenciais foi desativado."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de arquivos criptografados"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Criptografar dados privados de usuário"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Ativar armazenamento do sistema de arquivo criptografado para dados privados do usuário neste aparelho."</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"A ativação dos Sistemas de arquivo criptografados exige uma limpeza de dados do dispositivo."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"A desativação dos Sistemas de arquivo criptografados exige uma limpeza de dados do dispositivo."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Ativar"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Desativar"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"A alteração do modo do Sistema de arquivos criptografados foi cancelada."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Aviso dos Sistemas de arquivo criptografados."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Privacidade"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 68c8232..30b3358 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Хранилище регистрационных данных очищено."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Хранилище регистрационных данных включено."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Хранилище регистрационных данных отключено."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Зашифрованная файловая система"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Зашифровать личные данные пользователя"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Включить хранилище в зашифрованной файловой системе для хранения личных данных пользователя на этом устройстве"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Для включения зашифрованных файловых систем требуется удаление данных с устройства."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Для отключения зашифрованных файловых систем требуется удаление данных с устройства."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Включить"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Отключить"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Отмена"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Изменение режима зашифрованной файловой системы отменено."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Предупреждение для зашифрованных файловых систем"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Конфиденциальность"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 813e00a..c1d81fb 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Uppgiftslagringen raderades."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Uppgiftslagring har inaktiverats."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Krypterat filsystem"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Kryptera privata användardata"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktivera krypterat filsystemarkiv för privata användardata på den här enheten"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivering av krypterade filsystem kräver datarensning på enheten."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Inaktivering av krypterade filsystem kräver datarensning på enheten."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktivera"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Inaktivera"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Avbryt"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Lägesändringen för krypterat filsystem avbröts."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Varning: växling av krypterat filsystem."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Sekretess"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e34cc0e..161d930 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"Kimlik bilgileri deposu silindi."</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
<string name="credentials_disabled" msgid="7453188089059045380">"Kimlik bilgileri deposu devre dışı."</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"Şifrelenmiş Dosya Sistemi"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"Özel kullanıcı verilerini şifrele"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Bu cihazdaki özel kullanıcı verileri için şifrelenmiş dosya sistemi depolamasını etkinleştir"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Şifrelenmiş Dosya Sistemlerini etkinleştirilmek, cihazda veri silme işlemi yapılmasını gerektirir."</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Şifrelenmiş Dosya Sistemlerini devre dışı bırakmak, cihazda veri silme işlemi yapılmasını gerektirir."</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Etkinleştir"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Devre dışı bırak"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"İptal"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Şifrelenmiş Dosya Sistemleri modu değişikliği iptal edildi."</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Şifrelenmiş Dosya Sistemi Uyarısı."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
<string name="privacy_settings" msgid="9206631214140954954">"Gizlilik"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5196bbb..a014eee 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"该凭证存储已删除。"</string>
<string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
<string name="credentials_disabled" msgid="7453188089059045380">"凭证存储已停用。"</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"加密文件系统"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"加密用户私人数据"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"在此设备中针对用户私人数据启用加密文件系统存储"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"必须清除设备数据才能启用加密文件系统。"</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"必须清除设备数据才能停用加密文件系统。"</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"启用"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"停用"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"取消"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"已取消加密文件系统的模式更改。"</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"加密文件系统警告。"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
<string name="privacy_settings" msgid="9206631214140954954">"隐私权"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b4f6fff..4069ae2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1080,6 +1080,16 @@
<string name="credentials_erased" msgid="7700309135582200849">"已清除認證儲存空間內容。"</string>
<string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
<string name="credentials_disabled" msgid="7453188089059045380">"已停用認證儲存空間。"</string>
+ <string name="encrypted_fs_category" msgid="1841367653663913956">"加密檔案系統"</string>
+ <string name="encrypted_fs_enable" msgid="3884033081603327729">"加密使用者隱私資訊"</string>
+ <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"啟用加密檔案系統，以儲存此裝置的使用者隱私資訊"</string>
+ <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"啟用加密檔案系統前必須抹除裝置資料。"</string>
+ <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"停用加密檔案系統前必須抹除裝置資料。"</string>
+ <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"啟用"</string>
+ <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"停用"</string>
+ <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"取消"</string>
+ <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"已取消變更加密檔案系統模式。"</string>
+ <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"加密檔案系統警告。"</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
<string name="privacy_settings" msgid="9206631214140954954">"隱私設定"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 871036b..5c33ae5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2464,6 +2464,27 @@
<!-- toast message -->
<string name="credentials_disabled">Credential storage is disabled.</string>
+ <!-- Title of preference group for encrypted filesystem settings -->
+ <string name="encrypted_fs_category">Encrypted File System</string>
+ <!-- Title of preference to enable/dislable encrypted filesystem -->
+ <string name="encrypted_fs_enable">Encrypt private user data</string>
+ <!-- Summary of preference to enable/dislable encrypted filesystem -->
+ <string name="encrypted_fs_enable_summary">Enable encrypted file system storage for private user data in this device</string>
+ <!-- Dialog message to enable encrypted filesystem -->
+ <string name="encrypted_fs_enable_dialog">Enabling Encrypted File Systems requires a device data wipe.</string>
+ <!-- Dialog message to disable encrypted filesystem -->
+ <string name="encrypted_fs_disable_dialog">Disabling Encrypted File Systems requires a device data wipe.</string>
+ <!-- Button label to enable encrypted filesystem -->
+ <string name="encrypted_fs_enable_button">Enable</string>
+ <!-- Button label to disable encrypted filesystem -->
+ <string name="encrypted_fs_disable_button">Disable</string>
+ <!-- Button message to cancel toggling encrypted filesystem -->
+ <string name="encrypted_fs_cancel_button">Cancel</string>
+ <!-- Toast message to notify cancel toggling encrypted filesystem -->
+ <string name="encrypted_fs_cancel_confirm">Encrypted File Systems mode change cancelled.</string>
+ <!-- Dialog title to toggle encrypted filesystem -->
+ <string name="encrypted_fs_alert_dialog_title">Encrypted File Systems Warning.</string>
+
<!-- Sound settings screen, setting check box label -->
<string name="emergency_tone_title">Emergency tone</string>
<!-- Sound settings screen, setting option summary text -->
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 1348d48..05a655a 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -66,6 +66,10 @@
private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback";
+ // Encrypted File Systems constants
+ private static final String PROPERTY_EFS_ENABLED = "persist.security.efs.enabled";
+ private static final String PROPERTY_EFS_TRANSITION = "persist.security.efs.trans";
+
private CheckBoxPreference mVisiblePattern;
private CheckBoxPreference mTactileFeedback;
@@ -80,6 +84,9 @@
// Credential storage
private CredentialStorage mCredentialStorage = new CredentialStorage();
+ // Encrypted file system
+ private CheckBoxPreference mEncryptedFSEnabled;
+
private CheckBoxPreference mNetwork;
private CheckBoxPreference mGps;
private CheckBoxPreference mAssistedGps;
@@ -209,6 +216,11 @@
root.addPreference(credentialsCat);
mCredentialStorage.createPreferences(credentialsCat, CredentialStorage.TYPE_KEYSTORE);
+ // File System Encryption
+ PreferenceCategory encryptedfsCat = new PreferenceCategory(this);
+ encryptedfsCat.setTitle(R.string.encrypted_fs_category);
+ //root.addPreference(encryptedfsCat);
+ mCredentialStorage.createPreferences(encryptedfsCat, CredentialStorage.TYPE_ENCRYPTEDFS);
return root;
}
@@ -302,18 +314,21 @@
private static final int MINIMUM_PASSWORD_LENGTH = 8;
private static final int TYPE_KEYSTORE = 0;
+ private static final int TYPE_ENCRYPTEDFS = 1;
// Dialog identifiers
private static final int DLG_BASE = 0;
private static final int DLG_UNLOCK = DLG_BASE + 1;
private static final int DLG_PASSWORD = DLG_UNLOCK + 1;
private static final int DLG_RESET = DLG_PASSWORD + 1;
+ private static final int DLG_ENABLE_EFS = DLG_RESET + 1;
private KeyStore mKeyStore = KeyStore.getInstance();
private int mState;
private boolean mSubmit = false;
private boolean mExternal = false;
+ private boolean mWillEnableEncryptedFS;
private int mShowingDialog = 0;
// Key Store controls
@@ -322,6 +337,10 @@
private Preference mPasswordButton;
private Preference mResetButton;
+
+ // Encrypted file system controls
+ private CheckBoxPreference mEncryptedFSEnabled;
+
void resume() {
mState = mKeyStore.test();
updatePreferences(mState);
@@ -373,6 +392,10 @@
lock();
}
return true;
+ } else if (preference == mEncryptedFSEnabled) {
+ Boolean bval = (Boolean)value;
+ mWillEnableEncryptedFS = bval.booleanValue();
+ showSwitchEncryptedFSDialog();
}
return true;
}
@@ -391,9 +414,26 @@
}
public void onClick(DialogInterface dialog, int button) {
- mSubmit = (button == DialogInterface.BUTTON_POSITIVE);
- if (button == DialogInterface.BUTTON_NEUTRAL) {
- reset();
+ if (mShowingDialog != DLG_ENABLE_EFS) {
+ mSubmit = (button == DialogInterface.BUTTON_POSITIVE);
+ if (button == DialogInterface.BUTTON_NEUTRAL) {
+ reset();
+ }
+ } else {
+ if (button == DialogInterface.BUTTON_POSITIVE) {
+ Intent intent = new Intent("android.intent.action.MASTER_CLEAR");
+ intent.putExtra("enableEFS", mWillEnableEncryptedFS);
+ sendBroadcast(intent);
+ updatePreferences(mState);
+ } else if (button == DialogInterface.BUTTON_NEGATIVE) {
+ // Cancel action
+ Toast.makeText(SecuritySettings.this, R.string.encrypted_fs_cancel_confirm,
+ Toast.LENGTH_SHORT).show();
+ updatePreferences(mState);
+ } else {
+ // Unknown - should not happen
+ return;
+ }
}
}
@@ -507,16 +547,25 @@
category.addPreference(mResetButton);
break;
+ case TYPE_ENCRYPTEDFS:
+ mEncryptedFSEnabled = new CheckBoxPreference(SecuritySettings.this);
+ mEncryptedFSEnabled.setTitle(R.string.encrypted_fs_enable);
+ mEncryptedFSEnabled.setSummary(R.string.encrypted_fs_enable_summary);
+ mEncryptedFSEnabled.setOnPreferenceChangeListener(this);
+ // category.addPreference(mEncryptedFSEnabled);
+ break;
}
}
private void updatePreferences(int state) {
mAccessCheckBox.setChecked(state == KeyStore.NO_ERROR);
-
- mResetButton.setEnabled(state != KeyStore.UNINITIALIZED);
- mAccessCheckBox.setEnabled(state != KeyStore.UNINITIALIZED);
+ boolean encFSEnabled = SystemProperties.getBoolean(PROPERTY_EFS_ENABLED,
+ false);
+ mResetButton.setEnabled((!encFSEnabled) && (state != KeyStore.UNINITIALIZED));
+ mAccessCheckBox.setEnabled((state != KeyStore.UNINITIALIZED) && (!encFSEnabled));
// Encrypted File system preferences
+ mEncryptedFSEnabled.setChecked(encFSEnabled);
// Show a toast message if the state is changed.
if (mState == state) {
@@ -586,5 +635,24 @@
.setNegativeButton(getString(android.R.string.cancel), this)
.create().show();
}
+
+ private void showSwitchEncryptedFSDialog() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(SecuritySettings.this)
+ .setCancelable(false)
+ .setTitle(R.string.encrypted_fs_alert_dialog_title);
+
+ mShowingDialog = DLG_ENABLE_EFS;
+ if (mWillEnableEncryptedFS) {
+ builder.setMessage(R.string.encrypted_fs_enable_dialog)
+ .setPositiveButton(R.string.encrypted_fs_enable_button, this)
+ .setNegativeButton(R.string.encrypted_fs_cancel_button, this)
+ .create().show();
+ } else {
+ builder.setMessage(R.string.encrypted_fs_disable_dialog)
+ .setPositiveButton(R.string.encrypted_fs_disable_button, this)
+ .setNegativeButton(R.string.encrypted_fs_cancel_button, this)
+ .create().show();
+ }
+ }
}
}