Merge "RadioInfo: Update the network type listing"
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8bb99c50..a898aee 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -633,7 +633,7 @@
<string name="sync_settings" msgid="9186125469300013491">"Contas e sincronização"</string>
<string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
- <string name="display_settings" msgid="7965901687241669598">"Exibir"</string>
+ <string name="display_settings" msgid="7965901687241669598">"Tela"</string>
<string name="accelerometer_title" msgid="7854608399547349157">"Girar tela"</string>
<string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Alternar orientação automaticamente ao girar o tablet"</string>
<string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Alternar orientação automaticamente ao girar o telefone"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90b1446..6bbc8a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1203,6 +1203,8 @@
<string name="wifi_menu_modify">Modify network</string>
<!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
<string name="wifi_empty_list_wifi_off">To see available networks, turn Wi-Fi on.</string>
+ <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+ <string name="wifi_empty_list_wifi_on">Wi-Fi on, but no Wi-Fi networks around.</string>
<!-- Dialog for Access Points --> <skip />
<!-- Label to show/hide advanced options -->
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index c315acd..434dfe7 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -115,7 +115,7 @@
private Preference mSignalStrength;
private Preference mUptime;
- private static String sUnknown;
+ private String sUnknown;
private Preference mBatteryStatus;
private Preference mBatteryLevel;
@@ -188,9 +188,7 @@
mBatteryStatus = findPreference(KEY_BATTERY_STATUS);
mRes = getResources();
- if (sUnknown == null) {
- sUnknown = mRes.getString(R.string.device_info_default);
- }
+ sUnknown = mRes.getString(R.string.device_info_default);
mPhone = PhoneFactory.getDefaultPhone();
// Note - missing in zaku build, be careful later...
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 22ba3bd..29c1229 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -461,6 +461,9 @@
((WifiSettingsForSetupWizardXL)getActivity()).onAccessPointsUpdated(
getPreferenceScreen(), accessPoints);
} else {
+ if(accessPoints.size() == 0) {
+ addMessagePreference(R.string.wifi_empty_list_wifi_on);
+ }
for (AccessPoint accessPoint : accessPoints) {
getPreferenceScreen().addPreference(accessPoint);
}