diff options
author | Jason Monk <jmonk@google.com> | 2015-06-15 10:08:40 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2015-06-15 10:09:55 -0400 |
commit | c68b46c1f22e1679b3b4a31c20c7951ca1f119f0 (patch) | |
tree | 015c1ce5395e4d9e143e00e38b20f6325cf66a1c /src | |
parent | edb7b0d9a900a4a560d0777032600b52f38efd23 (diff) | |
download | packages_apps_Settings-c68b46c1f22e1679b3b4a31c20c7951ca1f119f0.zip packages_apps_Settings-c68b46c1f22e1679b3b4a31c20c7951ca1f119f0.tar.gz packages_apps_Settings-c68b46c1f22e1679b3b4a31c20c7951ca1f119f0.tar.bz2 |
Handle switch of ssid to CharSequence (for spans)
Change to reference the string directly for places like search,
etc.
Bug: 20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
Diffstat (limited to 'src')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 2d200b5..9a88ee8 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -216,7 +216,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment final int accessPointsSize = accessPoints.size(); for (int i = 0; i < accessPointsSize; ++i){ data = new SearchIndexableRaw(context); - data.title = accessPoints.get(i).getSsid(); + data.title = accessPoints.get(i).getSsidStr(); data.screenTitle = title; data.enabled = enabled; result.add(data); diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 1671c02..1742c16 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -382,7 +382,7 @@ public class WifiConfigController implements TextWatcher, config.hiddenSSID = true; } else if (!mAccessPoint.isSaved()) { config.SSID = AccessPoint.convertToQuotedString( - mAccessPoint.getSsid()); + mAccessPoint.getSsidStr()); } else { config.networkId = mAccessPoint.getConfig().networkId; } diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 6b9fc2f..fed8fd8 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -820,7 +820,7 @@ public class WifiSettings extends RestrictedSettingsFragment mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) { // Network is active but has no network ID - must be ephemeral. mWifiManager.disableEphemeralNetwork( - AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid())); + AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsidStr())); } else { // Should not happen, but a monkey seems to trigger it Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig()); @@ -922,7 +922,7 @@ public class WifiSettings extends RestrictedSettingsFragment WifiTracker.getCurrentAccessPoints(context, true, false, false); for (AccessPoint accessPoint : accessPoints) { data = new SearchIndexableRaw(context); - data.title = accessPoint.getSsid(); + data.title = accessPoint.getSsidStr(); data.screenTitle = res.getString(R.string.wifi_settings); data.enabled = enabled; result.add(data); |