Remove OEM-specific bits from RadioInfo.
The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.
Addresses issue:
http://buganizer/issue?id=1645706
Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index b560fff..1307666 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -188,35 +188,13 @@
android:layout_height="wrap_content"
/>
- <!-- Ciphering -->
- <LinearLayout style="@style/entry_layout">
- <Button android:id="@+id/ciph_toggle"
- android:textSize="14sp"
- android:layout_marginTop="8dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/radio_info_toggle_ciph_label"
- />
- <TextView android:id="@+id/ciphState" style="@style/info_value" />
-
- </LinearLayout>
-
- <!-- QXDM logging & radio power -->
- <LinearLayout style="@style/entry_layout">
- <Button android:id="@+id/qxdm_log"
- android:textSize="14sp"
- android:layout_marginTop="8dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
-
- <Button android:id="@+id/radio_power"
+ <!-- Radio Power -->
+ <Button android:id="@+id/radio_power"
android:textSize="14sp"
android:layout_marginTop="8dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
- </LinearLayout>
<!-- SMSC -->
<RelativeLayout android:layout_width="fill_parent"
@@ -261,5 +239,14 @@
<TextView android:id="@+id/dnsCheckState" style="@style/info_value" />
</LinearLayout>
+ <!-- Launch OEM-specific Info/Settings Activity (if any) -->
+ <Button android:id="@+id/oem_info"
+ android:textSize="14sp"
+ android:layout_marginTop="8dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/oem_radio_info_label"
+ />
+
</LinearLayout>
</ScrollView>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 02b7869..0d6ee0a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Zapnout rádio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Vypnout rádio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Povolit protokol QXDM SD"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Zakázat protokol QXDM SD"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Zobrazit adresář karty SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zobrazit povolená telefonní čísla"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Zobrazit čísla volání služeb"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Získat seznam PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Povolit připojení datových služeb"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Zakázat připojení datových služeb"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Povolit startovací data"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Zakázat startovací data"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"V provozu"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Nepokrytá oblast"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Pouze tísňová volání"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Použít test Ping na IpAddr:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Provést test Ping hostitele (www.google.cz):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Test klienta HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Přepnout šifrování"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Spustit test Ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Aktualizovat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e4d2b6c..dc8ffe9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Slå radio til"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Slå radio fra"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Aktiver QXDM SD-log"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Deaktiver QXDM SD-log"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Vis SIM-adressebog"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis faste opkaldsnumre"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Vis tjenesten faste opkaldsnumre"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Hent PDP-liste"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Aktiver dataforbindelse"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Deaktiver dataforbindelse"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Aktiver data ved start"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Deaktiver data ved start"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"I drift"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Ude af drift"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Kun nødopkald"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping-IpAdr.:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping-værtsnavn(www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP-klienttest:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Skift nummer"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Kør ping-test"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Opdater"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a5c2b79..65ec5e5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Mobilfunkverbindung aktivieren"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Mobilfunkverbindung deaktivieren"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"QXDM-SD-Protokoll aktivieren"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"QXDM-SD-Protokoll deaktivieren"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-Adressbuch anzeigen"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Begrenzte Rufnummern anzeigen"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Servicerufnummern anzeigen"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP-Liste abrufen"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Datenverbindung aktivieren"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Datenverbindung deaktivieren"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Daten beim Start aktivieren"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Daten beim Start deaktivieren"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"In Betrieb"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Außer Betrieb"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Nur Notrufe"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"IP-Adresse pingen:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Hostnamen pingen (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP Client-Test:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Verschlüsselung wechseln"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Pingtest ausführen"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Aktualisierung"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c1bb89c..a42a4b3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Ενεργοποίηση πομπού"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Απενεργοποίηση πομπού"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Ενεργοποίηση αρχείου καταγραφής QXDM SD"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Απενεργοποίηση αρχείου καταγραφής QXDM SD"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Προβολή βιβλίου διευθύνσεων κάρτας SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Προβολή καθορισμένων αριθμών κλήσης"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Προβολή αριθμών κλήσης υπηρεσίας"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Λήψη λίστας PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Ενεργοποίηση σύνδεσης δεδομένων"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Απενεργοποίηση σύνδεσης δεδομένων"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Ενεργοποίηση δεδομένων κατά την εκκίνηση"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Απενεργοποίηση δεδομένων κατά την εκκίνηση"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"Σε υπηρεσία"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Εκτός υπηρεσίας"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Μόνο κλήσεις έκτακτης ανάγκης"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IpAddr:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Εκτέλεση εντολής ping σε όνομα κεντρικού υπολογιστή (www.google.gr):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Δοκιμή HTTP πελάτη:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Ενεργοποίηση κρυπτογράφησης"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Εκτέλεση δοκιμής ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Ενημέρωση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a3fbc02..dbb8347 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,16 +20,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Encender la radio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Apagar la radio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Activar el registro SD de QXDM"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Desactivar el registro SD de QXDM"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver libreta de direcciones de SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números fijos"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Ver números del servicio técnico"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Obtener lista PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Activar la conexión de datos"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Desactivar conexión de datos"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Activar datos durante el reinicio"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Desactivar datos durante el reinicio"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"En servicio"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Fuera de servicio"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Sólo llamadas de emergencia"</string>
@@ -170,7 +164,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Buscar direcciones de Internet de IpAddr:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Buscar direcciones de Internet del nombre del servidor (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Prueba de cliente HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Cambiar el cifrado"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Ejecutar la prueba de búsqueda de direcciones de Internet"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Actualizar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d71c91f..010e91f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Activar señal móvil"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Desactivar señal móvil"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Habilitar registro QXDM de SD"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Inhabilitar registro QXDM de SD"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver libreta de direcciones de tarjeta SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcación fija"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Ver números de marcación de servicio"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Obtener lista PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Habilitar conexión de datos"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Inhabilitar conexión de datos"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Habilitar datos al iniciar"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Inhabilitar datos al iniciar"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"En servicio"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Fuera de servicio"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Sólo llamadas de emergencia"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Hacer ping a DirIP:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Hacer ping a nombre de host (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Prueba de cliente HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Alternar cifrado"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Ejecutar prueba de ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Actualizar"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a1c8458..beb1b02 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Allumer le signal radio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Éteindre le signal radio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Activer le journal SD QXDM"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Désactiver le journal QXMD SD"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Afficher le carnet d\'adresses de la carte SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Afficher les numéros autorisés"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Afficher les numéros de service"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Récupérer la liste PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Activer la connexion des données"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Désactiver la connexion des données"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Activer les données au démarrage"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Désactiver les données lors du démarrage"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"Service en cours"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Hors-service"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Appels d\'urgence uniquement"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Adr. IP ping :"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Nom de l\'hôte du ping (www.google.com) :"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Test du client HTTP :"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Activer/désactiver le cryptage"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Effectuer un test de ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC :"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Mettre à jour"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 38e5bd9..cc4acf2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Attiva segnale cellulare"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Disattiva segnale cellulare"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Attiva log SD QXDM"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Disattiva log SD QXDM"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualizza rubrica SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizza numeri selezione fissa"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Visualizza numeri dell\'elenco dei numeri di servizio"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Ottieni elenco PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Attiva connessione dati"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Disattiva connessione dati"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Attiva dati all\'avvio"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Disattiva dati all\'avvio"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"In servizio"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Fuori servizio"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Solo chiamate di emergenza"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Indir. IP ping:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Nome host ping (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Test client HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Attiva/disattiva cifratura"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Esegui test ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Aggiorna"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index caad2c2..d9c8930 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"不明"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"無線通信をオン"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"無線通信をオフ"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"QXDM SDログを有効にする"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"QXDM SDログを無効にする"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIMのアドレス帳を表示"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"発信番号制限を表示"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"サービス電話番号を表示"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDPリストを取得"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"データ接続を有効にする"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"データ接続を無効にする"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"起動時にデータを有効にする"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"起動時にデータを無効にする"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"使用中"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"休止中または使用不可"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"緊急通報のみ"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"IPアドレスのPing:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"ホスト名 (www.google.co.jp) のPing:"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTPクライアントテスト:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"暗号化の切り替え"</string>
<string name="ping_test_label" msgid="7255376471490860631">"pingテストの実行"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"更新"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1df434b..2fa75d4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"무선 켜기"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"무선 끄기"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"QXDM SD 로그 사용"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"QXDM SD 로그 사용 안함"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM 주소록 보기"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"발신 허용 번호 보기"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"SDN(Service Dialing Numbers) 보기"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP 목록 가져오기"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"데이터 연결 사용"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"데이터 연결 사용 안함"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"부팅할 때 데이터 사용"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"부팅할 때 데이터 사용 중지"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"서비스 상태"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"서비스 지역 벗어남"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"비상 전화만"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"IP 주소 Ping:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"호스트이름(www.google.com) Ping:"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP 클라이언트 테스트:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"암호화 선택"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Ping 테스트 실행"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"업데이트"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a01e23d..994db69 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Slå på radio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Slå av radio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Slå på QXDM-minnekortlogg"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Slå av QXDM-minnekortlogg"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Se SIM-adressebok"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View Fixed Dialing Numbers"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"View Service Dialing Numbers"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Get PDP list"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Slå på datatilkobling"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Slå av datatilkobling"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Slå på data ved oppstart"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Slå av data ved oppstart"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"I serviceperiode"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Ute av serviceperiode"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Kun nødsamtaler"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IpAddr:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping Hostname(www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP Client test:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Toggle ciphering"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Run ping test"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Update"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3027cf4..f395820 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Radio inschakelen"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Radio uitschakelen"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"QXDM SD-logboek inschakelen"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"QXDM SD-logboek uitschakelen"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-adresboek weergeven"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vaste nummers weergeven"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Servicenummers weergeven"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP-lijst ophalen"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Gegevensverbinding inschakelen"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Gegevensverbinding uitschakelen"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Gegevens inschakelen bij opstarten"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Gegevens uitschakelen bij opstarten"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"In gebruik"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Niet in gebruik"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Alleen noodoproepen"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"IP-adres pingen:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Hostnaam pingen (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP-client testen:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Codering in-/uitschakelen"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Pingtest uitvoeren"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Bijwerken"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7ad4ece..8b11a68 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Włącz radio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Wyłącz radio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Włącz dziennik QXDM dla karty SD"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Wyłącz dziennik QXDM dla karty SD"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Wyświetl książkę adresową na karcie SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Wyświetl ustalone numery"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Wyświetl numery usług"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Pobierz listę PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Włącz połączenie danych"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Wyłącz połączenie danych"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Włącz dane podczas uruchamianiu"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Wyłącz dane przy uruchamianiu"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"Działa"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Nie działa"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Tylko połączenia alarmowe"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Wyślij polecenie ping adresu IP:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Nazwa hosta dla operacji ping (www.google.pl):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Test klienta HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Przełącz szyfrowanie"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Przeprowadź test ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Aktualizuj"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b18bf66..baf50a8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Ligar rádio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Desligar rádio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Activar registo QXDM do SD"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Desactivar registo QXDM do SD"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver livro de endereços do SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcação fixos"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Ver números de marcação de serviços"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Obter lista de PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Activar ligação de dados"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Desactivar ligação de dados"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Activar dados no arranque"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Desactivar dados no arranque"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"Em serviço"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Fora de serviço"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Apenas chamadas de emergência"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping EnderIp:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Efectuar ping de nome de anfitrião (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Teste de cliente HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Comutar encriptação"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Executar teste de ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Actualizar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 72fe337..686b557 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Ativar o rádio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Desativar o rádio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Ativar registro do SD QXDM"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Desativar registro do SD QXDM"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualizar o catálogo de endereços do SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de chamada fixa"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Visualizar números de chamada de serviço"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Obter a lista PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Ativar conexão de dados"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Desativar conexão de dados"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Ativar dados na inicialização"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Desativar dados na inicialização"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"Em serviço"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Fora de serviço"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Apenas chamadas de emergência"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Aplicar ping em IpAddr:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Aplicar ping no nome do host (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Teste do Cliente HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Ativar/desativar criptografia"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Executar teste de ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Atualizar"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4daa306..4132d14 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Включить радио"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Отключить радио"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Включить SD-журнал QXDM"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Отключить SD-журнал QXDM"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Просмотреть адресную книгу на SIM-карте"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Просмотреть список разрешенных номеров"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Просмотреть номера служебного набора"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Получить список PDP"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Включить подключение для передачи данных"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Отключить подключение для передачи данных"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Включить данные при загрузке"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Отключить данные при загрузке"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"Обслуживается"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Вне зоны обслуживания"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Только вызовы службы экстренной помощи"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Выполнить проверку ping IP-адреса:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"ping имя узла (www.google.ru):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Проверка клиента HTTP:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Переключить шифрование"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Выполнить проверку ping"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Обновить"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 36d3066..ef7e60fe 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Sätt på radio"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Stäng av radio"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"Aktivera QXDM SD-logg"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"Inaktivera QXDM SD-logg"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visa SIM-adressbok"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visa Fasta nummer"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Visa tjänstenummer"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Hämta PDP-lista"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Aktivera dataanslutning"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Inaktivera dataanslutning"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Aktivera data vid start"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Inaktivera data vid start"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"I tjänst"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Ur funktion"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Endast nödsamtal"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IpAdr:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Pinga värdnamn (www.google.com):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"Test av HTTP-klient:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Växla kryptering"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Köra pingtest"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Uppdatera"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b7c7ca1..b2a2000 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"Radyoyu aç"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"Radyoyu kapat"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"QXDM SD günlüğünü etkinleştir"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"QXDM SD günlüğünü devre dışı bırak"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM adres defterini görüntüle"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Sabit Arama Numaralarını Görüntüle"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Hizmet Arama Numaralarını Görüntüle"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP listesini al"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"Veri bağlantısını etkinleştir"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"Veri bağlantısını devre dışı bırak"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"Açılışta verileri etkinleştir"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"Açılışta verileri devre dışı bırak"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"Hizmette"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"Hizmet dışı"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Yalnızca acil çağrılar için"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IpAddr:"</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping Ana Makine Adı (www.google.com.tr):"</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP İstemcisi testi:"</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"Şifrelemeyi aç/kapa"</string>
<string name="ping_test_label" msgid="7255376471490860631">"Ping testini çalıştır"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Güncelle"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ae7969a..d58eb62 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"未知"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"打开收音机"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"关闭收音机"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"启用 QXDM SD 日志"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"停用 QXDM SD 日志"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"查看 SIM 卡地址簿"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定拨号"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"查看服务拨号"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"获取 PDP 列表"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"启用数据连接"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"停用数据连接"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"启动时启用数据"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"启动时停用数据"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"正在使用中"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"不在服务区"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"仅限于紧急电话"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IP 地址："</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping 主机名 (www.google.com)："</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP 客户端测试："</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"切换加密"</string>
<string name="ping_test_label" msgid="7255376471490860631">"运行 ping 测试"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC："</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"更新"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 24a99e9..3e689d1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -22,16 +22,10 @@
<string name="device_info_default" msgid="7847265875578739287">"未知的"</string>
<string name="turn_on_radio" msgid="8706561489788373676">"開啟無線通訊"</string>
<string name="turn_off_radio" msgid="1820294552893884115">"關閉無線通訊"</string>
- <string name="turn_on_qxdm" msgid="634471960429852506">"啟用 QXDM SD 記錄"</string>
- <string name="turn_off_qxdm" msgid="5719931520533431085">"停用 QXDM SD 記錄"</string>
<string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"檢視 SIM 地址簿"</string>
<string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定撥號"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"檢視服務撥號號碼"</string>
<string name="radioInfo_menu_getPDP" msgid="560610293888406317">"取得 PDP 清單"</string>
- <string name="radioInfo_menu_enableData" msgid="5452877756028654595">"啟用資料連線"</string>
- <string name="radioInfo_menu_disableData" msgid="7645419447977636497">"停用資料連線"</string>
- <string name="radioInfo_menu_enableDataOnBoot" msgid="1438925440424627675">"開機顯示資料"</string>
- <string name="radioInfo_menu_disableDataOnBoot" msgid="1311993066146980972">"開機不顯示資料"</string>
<string name="radioInfo_service_in" msgid="1915416319177520020">"服務中"</string>
<string name="radioInfo_service_out" msgid="5238736759641916278">"超出服務範圍"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"只能撥打緊急電話"</string>
@@ -183,7 +177,6 @@
<string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IP 位址："</string>
<string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping 主機名稱 (www.google.com.tw)："</string>
<string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP 用戶端測試："</string>
- <string name="radio_info_toggle_ciph_label" msgid="1506817306430095478">"選取加密"</string>
<string name="ping_test_label" msgid="7255376471490860631">"執行 ping 測試"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC："</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"更新"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c98a867..9475346 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -30,10 +30,6 @@
<string name="turn_on_radio">Turn on radio</string>
<!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
<string name="turn_off_radio">Turn off radio</string>
- <!-- Phone Info screen. Button label to turn on the log for QXDM SD . Only shown in diagnostic screen, so precise translation is not needed. -->
- <string name="turn_on_qxdm">Enable QXDM SD log</string>
- <!-- Phone Info screen. Button label to turn off the log for QXDM SD . Only shown in diagnostic screen, so precise translation is not needed. -->
- <string name="turn_off_qxdm">Disable QXDM SD log</string>
<!-- Phone Info screen. Menu item label. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radioInfo_menu_viewADN">View SIM address book</string>
@@ -43,14 +39,6 @@
<string name="radioInfo_menu_viewSDN">View Service Dialing Numbers</string>
<!-- Phone Info screen. Menu item label. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radioInfo_menu_getPDP">Get PDP list</string>
- <!-- Phone Info screen. Menu item label. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="radioInfo_menu_enableData">Enable data connection</string>
- <!-- Phone Info screen. Menu item label. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="radioInfo_menu_disableData">Disable data connection</string>
- <!-- Phone Info screen. Menu item label. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="radioInfo_menu_enableDataOnBoot">Enable data on boot</string>
- <!-- Phone Info screen. Menu item label. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="radioInfo_menu_disableDataOnBoot">Disable data on boot</string>
<!-- Phone Info screen. Status label. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radioInfo_service_in">In service</string>
@@ -371,8 +359,6 @@
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_http_client_test">HTTP Client test:</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="radio_info_toggle_ciph_label">Toggle ciphering</string>
- <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="ping_test_label">Run ping test</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_smsc_label">SMSC:</string>
@@ -382,6 +368,8 @@
<string name="radio_info_smsc_refresh_label">Refresh</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_toggle_dns_check_label">Toggle DNS check</string>
+ <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
+ <string name="oem_radio_info_label">OEM-specific Info/Settings</string>
<!-- Band Mode Selection -->
<!-- Band mode screen. Title of activity. -->
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index ce236fd..3dae8d4 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -20,6 +20,8 @@
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.net.Uri;
@@ -57,7 +59,6 @@
import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.PhoneStateIntentReceiver;
import com.android.internal.telephony.TelephonyProperties;
-import com.android.internal.telephony.gsm.GSMPhone;
import com.android.internal.telephony.gsm.PdpConnection;
import org.apache.http.HttpResponse;
@@ -72,6 +73,8 @@
import java.util.ArrayList;
import java.util.List;
+import android.util.Log;
+
public class RadioInfo extends Activity {
private final String TAG = "phone";
@@ -83,8 +86,6 @@
private static final int EVENT_QUERY_PREFERRED_TYPE_DONE = 1000;
private static final int EVENT_SET_PREFERRED_TYPE_DONE = 1001;
private static final int EVENT_QUERY_NEIGHBORING_CIDS_DONE = 1002;
- private static final int EVENT_SET_QXDMLOG_DONE = 1003;
- private static final int EVENT_SET_CIPHER_DONE = 1004;
private static final int EVENT_QUERY_SMSC_DONE = 1005;
private static final int EVENT_UPDATE_SMSC_DONE = 1006;
@@ -94,7 +95,9 @@
private static final int MENU_ITEM_VIEW_SDN = 3;
private static final int MENU_ITEM_GET_PDP_LIST = 4;
private static final int MENU_ITEM_TOGGLE_DATA = 5;
- private static final int MENU_ITEM_TOGGLE_DATA_ON_BOOT = 6;
+
+ static final String ENABLE_DATA_STR = "Enable data connection";
+ static final String DISABLE_DATA_STR = "Disable data connection";
private TextView mDeviceId; //DeviceId is the IMEI in GSM and the MEID in CDMA
private TextView number;
@@ -119,16 +122,14 @@
private TextView mPingIpAddr;
private TextView mPingHostname;
private TextView mHttpClientTest;
- private TextView cipherState;
private TextView dnsCheckState;
private EditText smsc;
private Button radioPowerButton;
- private Button qxdmLogButton;
- private Button cipherToggleButton;
private Button dnsCheckToggleButton;
private Button pingTestButton;
private Button updateSmscButton;
private Button refreshSmscButton;
+ private Button oemInfoButton;
private Spinner preferredNetworkType;
private TelephonyManager mTelephonyManager;
@@ -136,11 +137,6 @@
private PhoneStateIntentReceiver mPhoneStateReceiver;
private INetStatService netstat;
- private OemCommands mOem = null;
- private boolean mQxdmLogEnabled;
- // The requested cipher state
- private boolean mCipherOn;
-
private String mPingIpAddrResult;
private String mPingHostnameResult;
private String mHttpClientTestResult;
@@ -220,22 +216,6 @@
mNeighboringCids.setText("unknown");
}
break;
- case EVENT_SET_QXDMLOG_DONE:
- ar= (AsyncResult) msg.obj;
- if (ar.exception == null) {
- mQxdmLogEnabled = !mQxdmLogEnabled;
-
- updateQxdmState(mQxdmLogEnabled);
- displayQxdmEnableResult();
- }
- break;
- case EVENT_SET_CIPHER_DONE:
- ar= (AsyncResult) msg.obj;
- if (ar.exception == null) {
- setCiphPref(mCipherOn);
- }
- updateCiphState();
- break;
case EVENT_QUERY_SMSC_DONE:
ar= (AsyncResult) msg.obj;
if (ar.exception != null) {
@@ -258,116 +238,6 @@
}
};
- static private class OemCommands {
-
- public static final int OEM_QXDM_SDLOG_DEFAULT_FILE_SIZE = 32;
- public static final int OEM_QXDM_SDLOG_DEFAULT_MASK = 0;
- public static final int OEM_QXDM_SDLOG_DEFAULT_MAX_INDEX = 8;
-
- static final int SIZE_OF_INT = 4;
- static final int OEM_FEATURE_ENABLE = 1;
- static final int OEM_FEATURE_DISABLE = 0;
- static final int OEM_SIMPE_FEAUTURE_LEN = 1;
-
- static final int OEM_QXDM_SDLOG_FUNCTAG = 0x00010000;
- static final int OEM_QXDM_SDLOG_LEN = 4;
- static final int OEM_PS_AUTO_ATTACH_FUNCTAG = 0x00020000;
- static final int OEM_CIPHERING_FUNCTAG = 0x00020001;
-
- /**
- * The OEM interface to store QXDM to SD.
- *
- * To start/stop logging QXDM logs to SD card, use tag
- * OEM_RIL_HOOK_QXDM_SD_LOG_SETUP 0x00010000
- *
- * "data" is a const oem_ril_hook_qxdm_sdlog_setup_data_st *
- * ((const oem_ril_hook_qxdm_sdlog_setup_data_st *)data)->head.func_tag
- * should be OEM_RIL_HOOK_QXDM_SD_LOG_SETUP
- * ((const oem_ril_hook_qxdm_sdlog_setup_data_st *)data)->head.len
- * should be "sizeof(unsigned int) * 4"
- * ((const oem_ril_hook_qxdm_sdlog_setup_data_st *)data)->mode
- * could be 0 for 'stop logging', or 1 for 'start logging'
- * ((const oem_ril_hook_qxdm_sdlog_setup_data_st *)data)->log_file_size
- * will assign the size of each log file, and it could be a value between
- * 1 and 512 (in megabytes, default value is recommended to set as 32).
- * This value will be ignored when mode == 0.
- * ((const oem_ril_hook_qxdm_sdlog_setup_data_st *)data)->log_mask will
- * assign the rule to filter logs, and it is a bitmask (bit0 is for MsgAll,
- * bit1 is for LogAll, and bit2 is for EventAll) recommended to be set as 0
- * by default. This value will be ignored when mode == 0.
- * ((const oem_ril_hook_qxdm_sdlog_setup_data_st *)data)->log_max_fileindex
- * set the how many logfiles will storted before roll over. This value will
- * be ignored when mode == 0.
- *
- * "response" is NULL
- *
- * typedef struct _oem_ril_hook_raw_head_st {
- * unsigned int func_tag;
- * unsigned int len;
- * } oem_ril_hook_raw_head_st;
- *
- * typedef struct _oem_ril_hook_qxdm_sdlog_setup_data_st {
- * oem_ril_hook_raw_head_st head;
- * unsigned int mode;
- * unsigned int log_file_size;
- * unsigned int log_mask;
- * unsigned int log_max_fileindex;
- * } oem_ril_hook_qxdm_sdlog_setup_data_st;
- *
- * @param enable set true to start logging QXDM in SD card
- * @param fileSize is the log file size in MB
- * @param mask is the log mask to filter
- * @param maxIndex is the maximum roll-over file number
- * @return byteArray to use in RIL RAW command
- */
- byte[] getQxdmSdlogData(boolean enable, int fileSize, int mask, int maxIndex) {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
- try {
- writeIntLittleEndian(dos, OEM_QXDM_SDLOG_FUNCTAG);
- writeIntLittleEndian(dos, OEM_QXDM_SDLOG_LEN * SIZE_OF_INT);
- writeIntLittleEndian(dos, enable ?
- OEM_FEATURE_ENABLE : OEM_FEATURE_DISABLE);
- writeIntLittleEndian(dos, fileSize);
- writeIntLittleEndian(dos, mask);
- writeIntLittleEndian(dos, maxIndex);
- } catch (IOException e) {
- return null;
- }
- return bos.toByteArray();
- }
-
- byte[] getPsAutoAttachData(boolean enable) {
- return getSimpleFeatureData(OEM_PS_AUTO_ATTACH_FUNCTAG, enable);
- }
-
- byte[] getCipheringData(boolean enable) {
- return getSimpleFeatureData(OEM_CIPHERING_FUNCTAG, enable);
- }
-
- private byte[] getSimpleFeatureData(int tag, boolean enable) {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
- try {
- writeIntLittleEndian(dos, tag);
- writeIntLittleEndian(dos, OEM_SIMPE_FEAUTURE_LEN * SIZE_OF_INT);
- writeIntLittleEndian(dos, enable ?
- OEM_FEATURE_ENABLE : OEM_FEATURE_DISABLE);
- } catch (IOException e) {
- return null;
- }
- return bos.toByteArray();
- }
-
- private void writeIntLittleEndian(DataOutputStream dos, int val)
- throws IOException {
- dos.writeByte(val);
- dos.writeByte(val >> 8);
- dos.writeByte(val >> 16);
- dos.writeByte(val >> 24);
- }
- }
-
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -398,7 +268,6 @@
sentSinceReceived = (TextView) findViewById(R.id.sentSinceReceived);
sent = (TextView) findViewById(R.id.sent);
received = (TextView) findViewById(R.id.received);
- cipherState = (TextView) findViewById(R.id.ciphState);
smsc = (EditText) findViewById(R.id.smsc);
dnsCheckState = (TextView) findViewById(R.id.dnsCheckState);
@@ -416,11 +285,6 @@
radioPowerButton = (Button) findViewById(R.id.radio_power);
radioPowerButton.setOnClickListener(mPowerButtonHandler);
- qxdmLogButton = (Button) findViewById(R.id.qxdm_log);
- qxdmLogButton.setOnClickListener(mQxdmButtonHandler);
-
- cipherToggleButton = (Button) findViewById(R.id.ciph_toggle);
- cipherToggleButton.setOnClickListener(mCipherButtonHandler);
pingTestButton = (Button) findViewById(R.id.ping_test);
pingTestButton.setOnClickListener(mPingButtonHandler);
updateSmscButton = (Button) findViewById(R.id.update_smsc);
@@ -430,14 +294,20 @@
dnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle);
dnsCheckToggleButton.setOnClickListener(mDnsCheckButtonHandler);
+ oemInfoButton = (Button) findViewById(R.id.oem_info);
+ oemInfoButton.setOnClickListener(mOemInfoButtonHandler);
+ PackageManager pm = getPackageManager();
+ Intent oemInfoIntent = new Intent("com.android.settings.OEM_RADIO_INFO");
+ List<ResolveInfo> oemInfoIntentList = pm.queryIntentActivities(oemInfoIntent, 0);
+ if (oemInfoIntentList.size() == 0) {
+ oemInfoButton.setEnabled(false);
+ }
+
mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);
mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
mPhoneStateReceiver.notifyPhoneCallState(EVENT_PHONE_STATE_CHANGED);
- updateQxdmState(null);
- mOem = new OemCommands();
-
phone.getPreferredNetworkType(
mHandler.obtainMessage(EVENT_QUERY_PREFERRED_TYPE_DONE));
phone.getNeighboringCids(
@@ -462,9 +332,7 @@
updateDataStats();
updateDataStats2();
updatePowerState();
- updateQxdmState(null);
updateProperties();
- updateCiphState();
updateDnsCheckState();
Log.i(TAG, "[RadioInfo] onResume: register phone & data intents");
@@ -502,14 +370,10 @@
menu.add(1, MENU_ITEM_GET_PDP_LIST,
0, R.string.radioInfo_menu_getPDP).setOnMenuItemClickListener(mGetPdpList);
menu.add(1, MENU_ITEM_TOGGLE_DATA,
- 0, R.string.radioInfo_menu_disableData).setOnMenuItemClickListener(mToggleData);
- menu.add(1, MENU_ITEM_TOGGLE_DATA_ON_BOOT,
- 0, R.string.radioInfo_menu_disableDataOnBoot).setOnMenuItemClickListener(
- mToggleDataOnBoot);
+ 0, DISABLE_DATA_STR).setOnMenuItemClickListener(mToggleData);
return true;
}
-
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// Get the TOGGLE DATA menu item in the right state.
@@ -520,26 +384,16 @@
switch (state) {
case TelephonyManager.DATA_CONNECTED:
case TelephonyManager.DATA_SUSPENDED:
- item.setTitle(R.string.radioInfo_menu_disableData);
+ item.setTitle(DISABLE_DATA_STR);
break;
case TelephonyManager.DATA_DISCONNECTED:
- item.setTitle(R.string.radioInfo_menu_enableData);
+ item.setTitle(ENABLE_DATA_STR);
break;
default:
visible = false;
break;
}
item.setVisible(visible);
-
- // Get the toggle-data-on-boot menu item in the right state.
- item = menu.findItem(MENU_ITEM_TOGGLE_DATA_ON_BOOT);
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(phone.getContext());
- boolean value = sp.getBoolean(GSMPhone.DATA_DISABLED_ON_BOOT_KEY, false);
- if (value) {
- item.setTitle(R.string.radioInfo_menu_enableDataOnBoot);
- } else {
- item.setTitle(R.string.radioInfo_menu_disableDataOnBoot);
- }
return true;
}
@@ -554,42 +408,6 @@
radioPowerButton.setText(buttonText);
}
- private void updateQxdmState(Boolean newQxdmStatus) {
- SharedPreferences sp =
- PreferenceManager.getDefaultSharedPreferences(phone.getContext());
- mQxdmLogEnabled = sp.getBoolean("qxdmstatus", false);
- // This is called from onCreate, onResume, and the handler when the status
- // is updated.
- if (newQxdmStatus != null) {
- SharedPreferences.Editor editor = sp.edit();
- editor.putBoolean("qxdmstatus", newQxdmStatus);
- editor.commit();
- mQxdmLogEnabled = newQxdmStatus;
- }
-
- String buttonText = mQxdmLogEnabled ?
- getString(R.string.turn_off_qxdm) :
- getString(R.string.turn_on_qxdm);
- qxdmLogButton.setText(buttonText);
- }
-
- private void setCiphPref(boolean value) {
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(phone.getContext());
- SharedPreferences.Editor editor = sp.edit();
- editor.putBoolean(GSMPhone.CIPHERING_KEY, value);
- editor.commit();
- }
-
- private boolean getCiphPref() {
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(phone.getContext());
- boolean ret = sp.getBoolean(GSMPhone.CIPHERING_KEY, true);
- return ret;
- }
-
- private void updateCiphState() {
- cipherState.setText(getCiphPref() ? "Ciphering ON" : "Ciphering OFF");
- }
-
private void updateDnsCheckState() {
dnsCheckState.setText(phone.isDnsCheckDisabled() ?
"0.0.0.0 allowed" :"0.0.0.0 not allowed");
@@ -987,19 +805,6 @@
disconnects.setText(sb.toString());
}
- private void displayQxdmEnableResult() {
- String status = mQxdmLogEnabled ? "Start QXDM Log" : "Stop QXDM Log";
-
- new AlertDialog.Builder(this).setMessage(status).show();
-
- mHandler.postDelayed(
- new Runnable() {
- public void run() {
- finish();
- }
- }, 2000);
- }
-
private MenuItem.OnMenuItemClickListener mViewADNCallback = new MenuItem.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -1046,24 +851,18 @@
}
};
- private void toggleDataDisabledOnBoot() {
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(phone.getContext());
- SharedPreferences.Editor editor = sp.edit();
- boolean value = sp.getBoolean(GSMPhone.DATA_DISABLED_ON_BOOT_KEY, false);
- editor.putBoolean(GSMPhone.DATA_DISABLED_ON_BOOT_KEY, !value);
- byte[] data = mOem.getPsAutoAttachData(value);
- if (data == null) {
- // don't commit
- return;
- }
-
- editor.commit();
- phone.invokeOemRilRequestRaw(data, null);
- }
-
- private MenuItem.OnMenuItemClickListener mToggleDataOnBoot = new MenuItem.OnMenuItemClickListener() {
+ private MenuItem.OnMenuItemClickListener mGetPdpList = new MenuItem.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
- toggleDataDisabledOnBoot();
+ phone.getDataCallList(null);
+ return true;
+ }
+ };
+
+ private MenuItem.OnMenuItemClickListener mSelectBandCallback = new MenuItem.OnMenuItemClickListener() {
+ public boolean onMenuItemClick(MenuItem item) {
+ Intent intent = new Intent();
+ intent.setClass(RadioInfo.this, BandMode.class);
+ startActivity(intent);
return true;
}
};
@@ -1086,22 +885,6 @@
}
};
- private MenuItem.OnMenuItemClickListener mGetPdpList = new MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- phone.getDataCallList(null);
- return true;
- }
- };
-
- private MenuItem.OnMenuItemClickListener mSelectBandCallback = new MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- Intent intent = new Intent();
- intent.setClass(RadioInfo.this, BandMode.class);
- startActivity(intent);
- return true;
- }
- };
-
OnClickListener mPowerButtonHandler = new OnClickListener() {
public void onClick(View v) {
//log("toggle radio power: currently " + (isRadioOn()?"on":"off"));
@@ -1109,20 +892,6 @@
}
};
- OnClickListener mCipherButtonHandler = new OnClickListener() {
- public void onClick(View v) {
- mCipherOn = !getCiphPref();
- byte[] data = mOem.getCipheringData(mCipherOn);
-
- if (data == null)
- return;
-
- cipherState.setText("Setting...");
- phone.invokeOemRilRequestRaw(data,
- mHandler.obtainMessage(EVENT_SET_CIPHER_DONE));
- }
- };
-
OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
public void onClick(View v) {
phone.disableDnsCheck(!phone.isDnsCheckDisabled());
@@ -1130,6 +899,19 @@
}
};
+ OnClickListener mOemInfoButtonHandler = new OnClickListener() {
+ public void onClick(View v) {
+ Intent intent = new Intent("com.android.settings.OEM_RADIO_INFO");
+ try {
+ startActivity(intent);
+ } catch (android.content.ActivityNotFoundException ex) {
+ Log.d(TAG, "OEM-specific Info/Settings Activity Not Found : " + ex);
+ // If the activity does not exist, there are no OEM
+ // settings, and so we can just do nothing...
+ }
+ }
+ };
+
OnClickListener mPingButtonHandler = new OnClickListener() {
public void onClick(View v) {
updatePingState();
@@ -1150,22 +932,6 @@
}
};
- OnClickListener mQxdmButtonHandler = new OnClickListener() {
- public void onClick(View v) {
- byte[] data = mOem.getQxdmSdlogData(
- !mQxdmLogEnabled,
- mOem.OEM_QXDM_SDLOG_DEFAULT_FILE_SIZE,
- mOem.OEM_QXDM_SDLOG_DEFAULT_MASK,
- mOem.OEM_QXDM_SDLOG_DEFAULT_MAX_INDEX);
-
- if (data == null)
- return;
-
- phone.invokeOemRilRequestRaw(data,
- mHandler.obtainMessage(EVENT_SET_QXDMLOG_DONE));
- }
- };
-
AdapterView.OnItemSelectedListener
mPreferredNetworkHandler = new AdapterView.OnItemSelectedListener() {
public void onItemSelected(AdapterView parent, View v, int pos, long id) {