PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-08-08 20:58:37 +00:00
committed by Android (Google) Code Review
parent 07fd346996 cba834dedf
commit 4fbe967e0f
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/wifi/AccessPoint.java
View File

@@ -520,6 +520,10 @@ class AccessPoint extends Preference {
final Context context = getContext(); final Context context = getContext();
updateIcon(getLevel(), context); updateIcon(getLevel(), context);
// Force new summary
setSummary(null);
// Update to new summary
StringBuilder summary = new StringBuilder(); StringBuilder summary = new StringBuilder();
if (mState != null) { // This is the active connection if (mState != null) { // This is the active connection
@@ -551,22 +555,18 @@ class AccessPoint extends Preference {
summary.append(context.getString(R.string.wifi_remembered)); summary.append(context.getString(R.string.wifi_remembered));
} }
if (security != SECURITY_NONE) { // TODO: Wi-Fi team needs to decide what to do with this code.
String securityStrFormat; // if (security != SECURITY_NONE) {
if (summary.length() == 0) { // String securityStrFormat;
securityStrFormat = context.getString(R.string.wifi_secured_first_item); // if (summary.length() == 0) {
} else { // securityStrFormat = context.getString(R.string.wifi_secured_first_item);
securityStrFormat = context.getString(R.string.wifi_secured_second_item); // } else {
} // securityStrFormat = context.getString(R.string.wifi_secured_second_item);
} // }
// }
} }
// This is a workaround, see bug report...
if (summary.length() < 1) {
summary.append(" ");
}
if (WifiSettings.mVerboseLogging > 0) { if (WifiSettings.mVerboseLogging > 0) {
//add RSSI/band information for this config, what was seen up to 6 seconds ago //add RSSI/band information for this config, what was seen up to 6 seconds ago
//verbose WiFi Logging is only turned on thru developers settings //verbose WiFi Logging is only turned on thru developers settings
@@ -591,7 +591,11 @@ class AccessPoint extends Preference {
} }
} }
setSummary(summary.toString()); if (summary.length() > 0) {
setSummary(summary.toString());
} else {
showSummary = false;
}
} }
/** /**