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

Handle switch of ssid to CharSequence (for spans)

Browse Source 
Change to reference the string directly for places like search,
etc.

Bug: 20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
This commit is contained in:
Jason Monk
2015-06-15 10:08:40 -04:00
parent edb7b0d9a9
commit c68b46c1f2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
View File

@@ -216,7 +216,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
final int accessPointsSize = accessPoints.size(); final int accessPointsSize = accessPoints.size();
for (int i = 0; i < accessPointsSize; ++i){ for (int i = 0; i < accessPointsSize; ++i){
data = new SearchIndexableRaw(context); data = new SearchIndexableRaw(context);
data.title = accessPoints.get(i).getSsid(); data.title = accessPoints.get(i).getSsidStr();
data.screenTitle = title; data.screenTitle = title;
data.enabled = enabled; data.enabled = enabled;
result.add(data); result.add(data);

2
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -382,7 +382,7 @@ public class WifiConfigController implements TextWatcher,
config.hiddenSSID = true; config.hiddenSSID = true;
} else if (!mAccessPoint.isSaved()) { } else if (!mAccessPoint.isSaved()) {
config.SSID = AccessPoint.convertToQuotedString( config.SSID = AccessPoint.convertToQuotedString(
mAccessPoint.getSsid()); mAccessPoint.getSsidStr());
} else { } else {
config.networkId = mAccessPoint.getConfig().networkId; config.networkId = mAccessPoint.getConfig().networkId;
} }

4
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -820,7 +820,7 @@ public class WifiSettings extends RestrictedSettingsFragment
mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) { mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
// Network is active but has no network ID - must be ephemeral. // Network is active but has no network ID - must be ephemeral.
mWifiManager.disableEphemeralNetwork( mWifiManager.disableEphemeralNetwork(
AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid())); AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsidStr()));
} else { } else {
// Should not happen, but a monkey seems to trigger it // Should not happen, but a monkey seems to trigger it
Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig()); 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); WifiTracker.getCurrentAccessPoints(context, true, false, false);
for (AccessPoint accessPoint : accessPoints) { for (AccessPoint accessPoint : accessPoints) {
data = new SearchIndexableRaw(context); data = new SearchIndexableRaw(context);
data.title = accessPoint.getSsid(); data.title = accessPoint.getSsidStr();
data.screenTitle = res.getString(R.string.wifi_settings); data.screenTitle = res.getString(R.string.wifi_settings);
data.enabled = enabled; data.enabled = enabled;
result.add(data); result.add(data);