Merge "Prevent orphaned fragment on the settings stack." into ics-mr1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf87d35..649e06c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,8 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 333b36d..3456db2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -331,9 +331,9 @@
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Změnit nebo deaktivovat bezpečnostní gesto, kód PIN nebo heslo"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vyberte způsob uzamknutí obrazovky"</string>
<string name="unlock_backup_info_summary" msgid="108524727803788172">"Pokud vás funkce Odemknutí obličejem nevidí, jak chcete zařízení odemknout?"</string>
- <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nic"</string>
+ <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Žádný"</string>
<string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
- <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Snímek"</string>
+ <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Tažením"</string>
<string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Žádné zabezpečení"</string>
<string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Odemknutí obličejem"</string>
<string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Nízké zabezpečení, experimentální"</string>
@@ -345,7 +345,7 @@
<string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečení"</string>
<string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázáno správcem, zásadami šifrování nebo úložištěm pověření"</string>
<string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nic"</string>
- <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Snímek"</string>
+ <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Tažením"</string>
<string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odemknutí obličejem"</string>
<string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečeno pomocí gesta"</string>
<string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zabezpečeno pomocí kódu PIN"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3663ab8..347323b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -330,7 +330,7 @@
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Skift skærmlås"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Skift eller deaktiver mønster, PIN-kode eller adgangskode."</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vælg en metode til låsning af skærmen"</string>
- <string name="unlock_backup_info_summary" msgid="108524727803788172">"Hvordan vil du låse op, når du ikke kan låse op med ansigt?"</string>
+ <string name="unlock_backup_info_summary" msgid="108524727803788172">"Hvordan vil du låse op, når Ansigtslås ikke kan se dig?"</string>
<string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ingen"</string>
<string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
<string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Træk fingeren hen over"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 22bbb8f..c062d99 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -414,7 +414,7 @@
<string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
<string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
<string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Möglicherweise müssen Sie diesen Schlüssel auch auf dem anderen Gerät eingeben."</string>
- <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@b37c60d) -->
+ <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@771c8a71) -->
<string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>Pairing mit diesem Gerät durchführen?"</string>
<string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Geben Sie zum Pairing mit <xliff:g id="BOLD1_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1"></b><br><br></xliff:g> <xliff:g id="BOLD2_1"><br><b></xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2"></b></xliff:g> ein und drücken Sie anschließend die Eingabetaste."</string>
<string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Kopplung durchführen"</string>
@@ -985,8 +985,8 @@
<string name="filter" msgid="2018011724373033887">"Filter"</string>
<string name="filter_dlg_title" msgid="8693024463731076091">"Filteroptionen auswählen"</string>
<string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
- <string name="filter_apps_third_party" msgid="7786348047690140979">"Heruntergeladene"</string>
- <string name="filter_apps_running" msgid="7767071454371350486">"Ausgeführte"</string>
+ <string name="filter_apps_third_party" msgid="7786348047690140979">"Heruntergeladen"</string>
+ <string name="filter_apps_running" msgid="7767071454371350486">"Aktiv"</string>
<string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-Speicher"</string>
<string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Auf SD-Karte"</string>
<string name="disabled" msgid="9206776641295849915">"Deaktiviert"</string>
@@ -996,7 +996,7 @@
<string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-Kartensp."</string>
<string name="recompute_size" msgid="7722567982831691718">"Größe wird neu berechnet..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"App-Daten löschen?"</string>
- <string name="clear_data_dlg_text" msgid="8847257251846779938">"Alle Daten dieser App werden dauerhaft gelöscht. Dazu zählen alle Dateien, Einstellungen, Konten, Datenbanken."</string>
+ <string name="clear_data_dlg_text" msgid="8847257251846779938">"Alle Daten dieser App werden endgültig gelöscht. Dazu zählen alle Dateien, Einstellungen, Konten, Datenbanken."</string>
<string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
<string name="dlg_cancel" msgid="1674753358972975911">"Abbrechen"</string>
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7dce9fb..fca9b63 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -499,7 +499,7 @@
<string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informarme cuando haya una red abierta disponible"</string>
<string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Solo conexiones buenas"</string>
<string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
- <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Mantener Wi-Fi durante suspensión"</string>
+ <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Usar Wi-Fi en suspensión"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Error al cambiar la configuración"</string>
<string name="wifi_add_network" msgid="6234851776910938957">"Añadir red"</string>
<string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
@@ -837,7 +837,7 @@
<string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuja tu patrón de desbloqueo"</string>
<string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
<string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
- <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamada"</string>
+ <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamadas"</string>
<string name="call_settings_summary" msgid="7291195704801002886">"Configurar buzón, llamada en espera, desvío e identificador"</string>
<string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje de USB"</string>
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portátil"</string>
@@ -961,7 +961,7 @@
<string name="force_stop" msgid="7435006169872876756">"Forzar detención"</string>
<string name="total_size_label" msgid="1048676419552557254">"Total"</string>
<string name="application_size_label" msgid="8494609207373874267">"Aplicación"</string>
- <string name="external_code_size_label" msgid="3459343140355961335">"Almacenamiento en USB"</string>
+ <string name="external_code_size_label" msgid="3459343140355961335">"En almacen. USB"</string>
<string name="data_size_label" msgid="8679376373625710107">"Datos"</string>
<string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos en almacen. USB"</string>
<string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b305a72..63554d4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1387,7 +1387,7 @@
<string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
<string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"आप सेटअप करते समय किसी EAP Wi-Fi कनेक्शन को कॉन्िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग > वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
<string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्ट होने में कुछ मिनट लग सकते हैं..."</string>
- <!-- syntax error in translation for wifi_setup_description_connected (5235991893829582459) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:192 in java.io.StringReader@5cdf8f5e) -->
+ <!-- syntax error in translation for wifi_setup_description_connected (5235991893829582459) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:192 in java.io.StringReader@735cda3f) -->
<string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cf74081..912e5db 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1469,8 +1469,8 @@
<string name="data_usage_change_cycle" msgid="7776556448920114866">"주기 변경..."</string>
<string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"데이터 사용 주기를 재설정할 날짜:"</string>
<string name="data_usage_empty" msgid="8621855507876539282">"이 기간 동안 데이터를 사용한 앱이 없습니다."</string>
- <string name="data_usage_label_foreground" msgid="4938034231928628164">"전경"</string>
- <string name="data_usage_label_background" msgid="3225844085975764519">"배경"</string>
+ <string name="data_usage_label_foreground" msgid="4938034231928628164">"포그라운드"</string>
+ <string name="data_usage_label_background" msgid="3225844085975764519">"백그라운드"</string>
<string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"태블릿을 기준으로 측정됩니다. 이동통신사의 데이터 사용량 계산은 다를 수 있습니다."</string>
<string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"휴대전화를 기준으로 측정됩니다. 이동통신사의 데이터 사용량 계산은 다를 수 있습니다."</string>
<string name="data_usage_disable_mobile" msgid="5211007048880167438">"모바일 데이터를 사용하지 않도록 설정하시겠습니까?"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index baaf5c4..c5be65e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -131,11 +131,11 @@
<string name="bluetooth_pairing" msgid="1426882272690346242">"Parowanie..."</string>
<string name="bluetooth_device" msgid="5291950341750186887">"Urządzenie Bluetooth bez nazwy"</string>
<string name="progress_scanning" msgid="192587958424295789">"Wyszukiwanie"</string>
- <string name="progress_tap_to_pair" msgid="5655704645616731277">"Dotknij, aby sparować."</string>
+ <string name="progress_tap_to_pair" msgid="5655704645616731277">"Dotknij, by sparować"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Brak urządzeń Bluetooth w pobliżu"</string>
<string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Żądanie parowania Bluetooth"</string>
<string name="bluetooth_notif_title" msgid="2485175521845371514">"Żądanie parowania"</string>
- <string name="bluetooth_notif_message" msgid="1931617700075106801">"Dotknij, aby sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+ <string name="bluetooth_notif_message" msgid="1931617700075106801">"Dotknij, by sparować z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</string>
<string name="device_picker" msgid="8721012448931226323">"Selektor urządzenia Bluetooth"</string>
<string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 72c2cc7..c67d072 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1472,7 +1472,7 @@
<string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
<string name="data_usage_label_background" msgid="3225844085975764519">"Fundo"</string>
<string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Calculado pelo tablet. A utiliz. de dados calculada pela operadora pode diferir."</string>
- <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Calculado pelo telemóvel. A utiliz. de dados calculada pela operad.pode diferir."</string>
+ <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Calculado pelo telemóvel. A utiliz. de dados calcul. pela operad. pode diferir."</string>
<string name="data_usage_disable_mobile" msgid="5211007048880167438">"Desativar dados móveis?"</string>
<string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
<string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Definir limite de dados 4G"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d7eb59d..8bed683 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -131,7 +131,7 @@
<string name="bluetooth_pairing" msgid="1426882272690346242">"Сопряжение..."</string>
<string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-устройство без названия"</string>
<string name="progress_scanning" msgid="192587958424295789">"Поиск"</string>
- <string name="progress_tap_to_pair" msgid="5655704645616731277">"Устройства"</string>
+ <string name="progress_tap_to_pair" msgid="5655704645616731277">"Выберите устройство"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Устройства Bluetooth не найдены."</string>
<string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
<string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
@@ -256,7 +256,7 @@
<string name="cancel" msgid="6859253417269739139">"Отмена"</string>
<string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
<string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
- <string name="settings_shortcut" msgid="3936651951364030415">"Ярлык \"Настройки\""</string>
+ <string name="settings_shortcut" msgid="3936651951364030415">"Ярлык настроек"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
<string name="radio_controls_title" msgid="6889937359495515769">"Ещё..."</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Беспроводные сети"</string>
@@ -273,10 +273,10 @@
<string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и время"</string>
<string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установить дату и время"</string>
<string name="date_and_time_settings_summary" msgid="7095318986757583584">"Установка даты, времени, часового пояса и формата"</string>
- <string name="date_time_auto" msgid="7076906458515908345">"Автонастройка даты и времени"</string>
+ <string name="date_time_auto" msgid="7076906458515908345">"Дата и время сети"</string>
<string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Использовать время сети"</string>
<string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Использовать время сети"</string>
- <string name="zone_auto" msgid="334783869352026648">"Автонастройка часового пояса"</string>
+ <string name="zone_auto" msgid="334783869352026648">"Часовой пояс сети"</string>
<string name="zone_auto_summaryOn" msgid="6142830927278458314">"Использовать часовой пояс сети"</string>
<string name="zone_auto_summaryOff" msgid="2597745783162041390">"Использовать часовой пояс сети"</string>
<string name="date_time_24hour" msgid="1193032284921000063">"24-часовой формат"</string>
@@ -430,7 +430,7 @@
<string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Поиск..."</string>
<string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Настройки устройства"</string>
<string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Подключенные устройства"</string>
- <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Доступные устройства"</string>
+ <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Список"</string>
<string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Подключить"</string>
<string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Отключить"</string>
<string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Выполнить сопряжение и подключить"</string>
@@ -577,7 +577,7 @@
<string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Создать группу"</string>
<string name="wifi_p2p_menu_remove_group" msgid="4844634506540667517">"Удалить группу"</string>
<string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Дополнительно"</string>
- <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Поиск"</string>
+ <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Список"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ошибка подключения"</string>
@@ -683,7 +683,7 @@
<string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
<string name="firmware_version" msgid="4801135784886859972">"Версия Android"</string>
<string name="model_number" msgid="3765737700545384794">"Модель"</string>
- <string name="baseband_version" msgid="1848990160763524801">"Версия ПО модуля связи"</string>
+ <string name="baseband_version" msgid="1848990160763524801">"Прошивка модуля связи"</string>
<string name="kernel_version" msgid="9192574954196167602">"Версия ядра"</string>
<string name="build_number" msgid="3075795840572241758">"Номер сборки"</string>
<string name="device_info_not_available" msgid="8062521887156825182">"Недоступно"</string>
@@ -839,11 +839,11 @@
<string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Для подтверждения очистки SD-карты начертите графический ключ."</string>
<string name="call_settings_title" msgid="5188713413939232801">"Вызовы"</string>
<string name="call_settings_summary" msgid="7291195704801002886">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
- <string name="tether_settings_title_usb" msgid="6688416425801386511">"Общий USB-модем"</string>
+ <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-модем"</string>
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Точка доступа Wi-Fi"</string>
- <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Общий Bluetooth-модем"</string>
- <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Общий модем"</string>
- <string name="tether_settings_title_all" msgid="8356136101061143841">"Общий модем/точка доступа"</string>
+ <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-модем"</string>
+ <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Режим модема"</string>
+ <string name="tether_settings_title_all" msgid="8356136101061143841">"Режим модема"</string>
<string name="usb_title" msgid="7483344855356312510">"USB"</string>
<string name="usb_tethering_button_text" msgid="585829947108007917">"USB-модем"</string>
<string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-связь установлена, установите флажок для подключения"</string>
@@ -851,22 +851,22 @@
<string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Невозможно подключиться при использовании USB-накопителя"</string>
<string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB-подключения не обнаружено"</string>
<string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ошибка подключения USB"</string>
- <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Общий Bluetooth-модем"</string>
+ <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-модем"</string>
<string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Устройство работает в режиме модема"</string>
- <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Режим модема на этом устройстве включен"</string>
+ <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Включен"</string>
<string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Интернет-подключение планшетного ПК используется 1 устройством"</string>
<string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Интернет-подключение телефона используется 1 устройством"</string>
<string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Интернет-подключение планшетного ПК используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
<string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Интернет-подключение телефона используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
- <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Режим модема на этом устройстве отключен"</string>
- <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Режим модема на этом устройстве отключен"</string>
+ <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Выключен"</string>
+ <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Выключен"</string>
<string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Отсутствует подключение"</string>
<string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"Макс. число подключаемых устройств: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
<string name="bluetooth_untether_blank" msgid="2871192409329334813">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
<string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
<string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
<string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
- <string name="location_network_based" msgid="5569673665032992664">"Геопозиционирование Google"</string>
+ <string name="location_network_based" msgid="5569673665032992664">"По координатам сети"</string>
<string name="location_neighborhood_level" msgid="1337612962522836900">"Использовать Wi-Fi и мобильные сети для определения местоположения"</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположение определяется с помощью Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Спутники GPS"</string>
@@ -874,7 +874,7 @@
<string name="assisted_gps" msgid="4649317129586736885">"Использовать A-GPS"</string>
<string name="assisted_gps_enabled" msgid="8751899609589792803">"Использовать сервер для A-GPS (снимите флажок для менее интенсивного использования сети)"</string>
<string name="assisted_gps_disabled" msgid="6982698333968010748">"Использовать сервер для A-GPS (снимите флажок для улучшения работы GPS)"</string>
- <string name="use_location_title" msgid="5206937465504979977">"Местоположение и Поиск Google"</string>
+ <string name="use_location_title" msgid="5206937465504979977">"Учитывать при поиске"</string>
<string name="use_location_summary" msgid="3978805802386162520">"Разрешить Google использовать данные о местоположении для улучшения поиска и работы других служб"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"О планшетном ПК"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"О телефоне"</string>
@@ -1015,7 +1015,7 @@
<string name="move_app" msgid="5042838441401731346">"Переместить"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Переместить на планшет"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Переместить на телефон"</string>
- <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перенести на USB-накопитель"</string>
+ <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перенести на USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Переместить на SD-карту"</string>
<string name="moving" msgid="6431016143218876491">"Перемещение"</string>
<string name="insufficient_storage" msgid="481763122991093080">"Недостаточно места."</string>
@@ -1206,7 +1206,7 @@
<string name="history_details_title" msgid="3608240585315506067">"Подробная история"</string>
<string name="details_title" msgid="3792801565213935385">"Сведения об использовании"</string>
<string name="details_subtitle" msgid="32593908269911734">"Сведения об использовании"</string>
- <string name="controls_subtitle" msgid="390468421138288702">"Настроить режим энергопотребления"</string>
+ <string name="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Вложенные пакеты"</string>
<string name="power_screen" msgid="3023346080675904613">"Экран"</string>
<string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
@@ -1214,16 +1214,16 @@
<string name="power_cell" msgid="6596471490976003056">"Связь с сетью"</string>
<string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
<string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшетный ПК в режиме ожидания"</string>
- <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон в режиме ожидания"</string>
+ <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – активный режим"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Не отключать"</string>
<string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
- <string name="usage_type_wifi_running" msgid="8234997940652067049">"Использование Wi-Fi"</string>
+ <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшетный ПК"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
- <string name="usage_type_data_send" msgid="2857401966985425427">"Отправлено данных"</string>
- <string name="usage_type_data_recv" msgid="7251090882025234185">"Получено данных"</string>
+ <string name="usage_type_data_send" msgid="2857401966985425427">"Отправлено"</string>
+ <string name="usage_type_data_recv" msgid="7251090882025234185">"Получено"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Время работы"</string>
@@ -1303,7 +1303,7 @@
<string name="tts_engine_settings_button" msgid="1030512042040722285">"Настройки синтеза речи"</string>
<string name="tts_engine_preference_section_title" msgid="448294500990971413">"Система по умолчанию"</string>
<string name="tts_general_section_title" msgid="4402572014604490502">"Общие"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Управление питанием"</string>
+ <string name="gadget_title" msgid="5519037532720577836">"Упр. питанием"</string>
<string name="gadget_toggle_wifi" msgid="2382963973155082629">"Обновление настроек Wi-Fi"</string>
<string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
@@ -1505,8 +1505,8 @@
<string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Когда лимит трафика будет исчерпан, передача данных по сетям <xliff:g id="NETWORKS">%1$s</xliff:g> прекратится."\n\n"Старайтесь не достигать лимита, так как оператор и устройство могут учитывать трафик по-разному."</string>
<string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ограничение фонового режима"</string>
<string name="data_usage_restrict_background" msgid="6387252645350792955">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."</string>
- <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Внимание!"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
- <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"Лимит:"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
+ <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Предупреждение"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
+ <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"Лимит"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
<string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Удаленные приложения"</string>
<string name="data_usage_received_sent" msgid="5039699009276621757">"Получено: <xliff:g id="RECEIVED">%1$s</xliff:g>; отправлено: <xliff:g id="SENT">%2$s</xliff:g>"</string>
<string name="data_usage_total_during_range" msgid="441648308264260691">"Трафик за период <xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a7d5108..d1c3a1c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -770,7 +770,7 @@
<string name="apn_apn" msgid="2479425126733513353">"APN"</string>
<string name="apn_http_proxy" msgid="1826885957243696354">"Проксі"</string>
<string name="apn_http_port" msgid="3763259523984976226">"Порт"</string>
- <string name="apn_user" msgid="455637547356117761">"Ім\'я кор."</string>
+ <string name="apn_user" msgid="455637547356117761">"Ім’я користувача"</string>
<string name="apn_password" msgid="5412301994998250968">"Пароль"</string>
<string name="apn_server" msgid="2436185314756372858">"Сервер"</string>
<string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index a7e6ac8..278859b 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -22,4 +22,7 @@
<!-- Whether the power control widget is enabled for this device. Should be overridden for
specific product builds. -->
<bool name="has_powercontrol_widget">true</bool>
+
+ <!-- Display additional System Update menu if true -->
+ <bool name="config_additional_system_update_setting_enable">false</bool>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 4b08c42..4119b6a 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -19,4 +19,7 @@
<!-- If false, MIN is displayed. If true, MSID is displayed. -->
<bool name="config_msid_enable" translatable="false">false</bool>
+ <string name="additional_system_update" translatable="false"></string>
+ <string name="additional_system_update_menu" translatable="false"></string>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9e9c89..20fa0df 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -637,6 +637,9 @@
<!-- Security Settings --><skip />
+ <!-- Security settings screen when using face unlock, setting option name to start an activity that allows the user to improve accuracy by adding additional enrollment faces -->
+ <string name="biometric_weak_improve_matching_title">Improve face matching</string>
+
<!-- Security settings screen, setting option name to change screen timeout -->
<string name="lock_after_timeout">Automatically lock</string>
<!-- Security settings screen, setting option summary to change screen timeout -->
@@ -3431,6 +3434,9 @@
<!-- Messaage shown in dialog when you can't manually sync -->
<string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>
+ <string name="wimax_settings">4G settings</string>
+ <string name="wimax_settings_summary">Set up & manage 4G network and modem</string>
+ <string name="status_wimax_mac_address">4G MAC address</string>
<!-- This is displayed to the user when the device needs to be decrypted -->
<string name="enter_password">Type password to decrypt storage</string>
<!-- This is displayed when the password is entered incorrectly -->
@@ -3764,4 +3770,9 @@
<!-- Representation of a numerical percentage. [CHAR LIMIT=8] -->
<string name="percentage"><xliff:g id="number" example="30">%d</xliff:g>%%</string>
+ <!-- A menu item in "About phone" that allows the user to update the phone with settings
+ from their cell phone carrier. The use of the string is similar to the string
+ "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+ <string name="additional_system_update_settings_list_item_title">Additional system updates</string>
+
</resources>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 19e22f4..aaa90a9 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -120,5 +120,9 @@
android:title="@string/status_up_time"
android:summary="@string/device_info_not_available"
android:persistent="false" />
-
+ <Preference android:key="wimax_mac_address"
+ style="?android:attr/preferenceInformationStyle"
+ android:title="@string/status_wimax_mac_address"
+ android:summary="@string/device_info_not_available"
+ android:persistent="false" />
</PreferenceScreen>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 14d28f2..7d832e4 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -26,6 +26,10 @@
android:summary="@string/unlock_set_unlock_mode_biometric_weak"
android:persistent="false"/>
+ <PreferenceScreen
+ android:key="biometric_weak_improve_matching"
+ android:title="@string/biometric_weak_improve_matching_title"/>
+
<CheckBoxPreference
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 134461d..20ffd8e 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -33,6 +33,16 @@
android:key="tether_settings"
android:title="@string/tether_settings_title_all" />
+ <PreferenceScreen
+ android:key="wimax_settings"
+ android:title="@string/wimax_settings"
+ android:summary="@string/wimax_settings_summary" >
+ <intent
+ android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings.wimax"
+ android:targetClass="com.android.settings.wimax.WimaxSettings" />
+ </PreferenceScreen>
+
<CheckBoxPreference
android:key="toggle_nfc"
android:title="@string/nfc_quick_toggle_title"
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index fb4a5cd..df421a2 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -276,7 +276,7 @@
KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key);
}
- private Intent getBiometricSensorIntent(int quality) {
+ private Intent getBiometricSensorIntent() {
Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);
fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);
@@ -286,9 +286,8 @@
boolean showTutorial = ALWAY_SHOW_TUTORIAL ||
!mChooseLockSettingsHelper.utils().isBiometricWeakEverChosen();
Intent intent = new Intent();
- intent.setClassName("com.android.facelock", showTutorial
- ? "com.android.facelock.FaceLockTutorial"
- : "com.android.facelock.SetupFaceLock");
+ intent.setClassName("com.android.facelock", "com.android.facelock.SetupIntro");
+ intent.putExtra("showTutorial", showTutorial);
PendingIntent pending = PendingIntent.getActivity(getActivity(), 0, fallBackIntent, 0);
intent.putExtra("PendingIntent", pending);
return intent;
@@ -352,7 +351,7 @@
startActivity(intent);
}
} else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
- Intent intent = getBiometricSensorIntent(quality);
+ Intent intent = getBiometricSensorIntent();
startActivity(intent);
} else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
mChooseLockSettingsHelper.utils().clearLock(false);
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index abff0ae..2940442 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -44,7 +44,6 @@
import android.widget.Button;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
-import android.widget.Toast;
public class ChooseLockPassword extends PreferenceActivity {
public static final String PASSWORD_MIN_KEY = "lockscreen.password_min";
@@ -388,7 +387,6 @@
LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
mLockPatternUtils.clearLock(isFallback);
mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
- Toast.makeText(getActivity(), R.string.lock_setup, Toast.LENGTH_SHORT).show();
getActivity().finish();
} else {
updateStage(Stage.ConfirmWrong);
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 314a432..180eee1 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -35,7 +35,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import android.widget.Toast;
import java.util.ArrayList;
import java.util.Collections;
@@ -513,8 +512,6 @@
utils.saveLockPattern(mChosenPattern, isFallback);
utils.setLockPatternEnabled(true);
- Toast.makeText(getActivity(), R.string.lock_setup, Toast.LENGTH_SHORT).show();
-
if (lockVirgin) {
utils.setVisiblePatternEnabled(true);
utils.setTactileFeedbackEnabled(false);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5df5805..ab58dd5 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -19,6 +19,7 @@
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+import android.app.Activity;
import android.app.AlertDialog;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
@@ -50,12 +51,15 @@
// Lock Settings
private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
+ private static final String KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING =
+ "biometric_weak_improve_matching";
private static final String KEY_LOCK_ENABLED = "lockenabled";
private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback";
private static final String KEY_SECURITY_CATEGORY = "security_category";
private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
+ private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST = 124;
// Misc Settings
private static final String KEY_SIM_LOCK = "sim_lock";
@@ -326,6 +330,13 @@
if (KEY_UNLOCK_SET_OR_CHANGE.equals(key)) {
startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
+ } else if (KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING.equals(key)) {
+ ChooseLockSettingsHelper helper =
+ new ChooseLockSettingsHelper(this.getActivity(), this);
+ if (!helper.launchConfirmationActivity(
+ CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST, null, null)) {
+ startBiometricWeakImprove(); // no password set, so no need to confirm
+ }
} else if (KEY_LOCK_ENABLED.equals(key)) {
lockPatternUtils.setLockPatternEnabled(isToggled(preference));
} else if (KEY_VISIBLE_PATTERN.equals(key)) {
@@ -360,6 +371,11 @@
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST &&
+ resultCode == Activity.RESULT_OK) {
+ startBiometricWeakImprove();
+ return;
+ }
createPreferenceHierarchy();
}
@@ -376,4 +392,10 @@
}
return true;
}
+
+ public void startBiometricWeakImprove(){
+ Intent intent = new Intent();
+ intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup");
+ startActivity(intent);
+ }
}
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 0ed781f..13f6902 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -43,6 +43,7 @@
private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
private static final String KEY_TOGGLE_NFC = "toggle_nfc";
+ private static final String KEY_WIMAX_SETTINGS = "wimax_settings";
private static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
private static final String KEY_VPN_SETTINGS = "vpn_settings";
private static final String KEY_TOGGLE_WIFI_P2P = "toggle_wifi_p2p";
@@ -109,6 +110,20 @@
String toggleable = Settings.System.getString(activity.getContentResolver(),
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+ //enable/disable wimax depending on the value in config.xml
+ boolean isWimaxEnabled = this.getResources().getBoolean(
+ com.android.internal.R.bool.config_wimaxEnabled);
+ if (!isWimaxEnabled) {
+ PreferenceScreen root = getPreferenceScreen();
+ Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
+ if (ps != null) root.removePreference(ps);
+ } else {
+ if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIMAX )
+ && isWimaxEnabled) {
+ Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
+ ps.setDependency(KEY_TOGGLE_AIRPLANE);
+ }
+ }
// Manually set dependencies for Wifi when not toggleable.
if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIFI)) {
findPreference(KEY_VPN_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index d7116c1..c315acd 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -22,6 +22,8 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.BatteryManager;
@@ -33,6 +35,7 @@
import android.os.SystemProperties;
import android.preference.Preference;
import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
import android.telephony.PhoneNumberUtils;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@@ -83,7 +86,7 @@
private static final String KEY_BT_ADDRESS = "bt_address";
private static final String KEY_SERIAL_NUMBER = "serial_number";
private static final String KEY_ICC_ID = "icc_id";
-
+ private static final String KEY_WIMAX_MAC_ADDRESS = "wimax_mac_address";
private static final String[] PHONE_RELATED_ENTRIES = {
KEY_DATA_STATE,
KEY_SERVICE_STATE,
@@ -248,6 +251,7 @@
mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
}
+ setWimaxStatus();
setWifiStatus();
setBtStatus();
setIpAddressStatus();
@@ -409,6 +413,21 @@
}
}
+ private void setWimaxStatus() {
+ ConnectivityManager cm = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
+ NetworkInfo ni = cm.getNetworkInfo(ConnectivityManager.TYPE_WIMAX);
+
+ if (ni == null) {
+ PreferenceScreen root = getPreferenceScreen();
+ Preference ps = (Preference) findPreference(KEY_WIMAX_MAC_ADDRESS);
+ if (ps != null) root.removePreference(ps);
+ } else {
+ Preference wimaxMacAddressPref = findPreference(KEY_WIMAX_MAC_ADDRESS);
+ String macAddress = SystemProperties.get("net.wimax.mac.address",
+ getString(R.string.status_unavailable));
+ wimaxMacAddressPref.setSummary(macAddress);
+ }
+ }
private void setWifiStatus() {
WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
WifiInfo wifiInfo = wifiManager.getConnectionInfo();