Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method"
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index 6207391b..ec6e64f 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -22,7 +22,8 @@
<NumberPicker
android:id="@+id/bytes"
- android:layout_width="48dip"
+ android:layout_width="wrap_content"
+ android:minWidth="48dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dip"
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/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index aa3f2e9..2055af0 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -193,9 +193,14 @@
ar= (AsyncResult) msg.obj;
if (ar.exception == null) {
int type = ((int[])ar.result)[0];
+ if (type >= mPreferredNetworkLabels.length) {
+ Log.e(TAG, "[RadioInfo] EVENT_QUERY_PREFERRED_TYPE_DONE: unknown " +
+ "type=" + type);
+ type = mPreferredNetworkLabels.length - 1;
+ }
preferredNetworkType.setSelection(type, true);
} else {
- preferredNetworkType.setSelection(8, true);
+ preferredNetworkType.setSelection(mPreferredNetworkLabels.length - 1, true);
}
break;
case EVENT_SET_PREFERRED_TYPE_DONE:
@@ -1009,7 +1014,7 @@
mPreferredNetworkHandler = new AdapterView.OnItemSelectedListener() {
public void onItemSelected(AdapterView parent, View v, int pos, long id) {
Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE);
- if (pos>=0 && pos<=7) { //IS THIS NEEDED to extend to the entire range of values
+ if (pos>=0 && pos<=(mPreferredNetworkLabels.length - 2)) {
phone.setPreferredNetworkType(pos, msg);
}
}
@@ -1027,5 +1032,9 @@
"CDMA only",
"EvDo only",
"GSM/CDMA auto (PRL)",
+ "LTE/CDMA auto (PRL)",
+ "LTE/GSM auto (PRL)",
+ "LTE/GSM/CDMA auto (PRL)",
+ "LTE only",
"Unknown"};
}
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 631e747..08cb0e0 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -439,7 +439,6 @@
mAllDetails = (ViewGroup)view.findViewById(R.id.all_details);
mSnippet = (ViewGroup)view.findViewById(R.id.snippet);
- mSnippet.setBackgroundResource(com.android.internal.R.drawable.title_bar_medium);
mSnippet.setPadding(0, mSnippet.getPaddingTop(), 0, mSnippet.getPaddingBottom());
mSnippetViewHolder = new RunningProcessesView.ViewHolder(mSnippet);
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);
}