Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-06-15 14:14:50 +00:00
committed by Android (Google) Code Review
parent 991f0f6549 6980d12c58
commit 5d8c276bb9
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -16,7 +16,11 @@
package com.android.settingslib.wifi;
import android.app.AppGlobals;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
@@ -30,17 +34,15 @@ import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.text.TextUtils;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.TtsSpan;
import android.util.Log;
import android.util.LruCache;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.os.RemoteException;
import android.app.AppGlobals;
import com.android.settingslib.R;
@@ -280,10 +282,17 @@ public class AccessPoint implements Comparable<AccessPoint> {
}
}
public String getSsid() {
public String getSsidStr() {
return ssid;
}
public CharSequence getSsid() {
SpannableString str = new SpannableString(ssid);
str.setSpan(new TtsSpan.VerbatimBuilder(ssid).build(), 0, ssid.length(),
Spannable.SPAN_INCLUSIVE_INCLUSIVE);
return str;
}
public String getConfigName() {
if (mConfig != null && mConfig.isPasspoint()) {
return mConfig.providerFriendlyName;

4
packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
View File

@@ -273,7 +273,7 @@ public class WifiTracker {
accessPoints.add(accessPoint);
if (config.isPasspoint() == false) {
apMap.put(accessPoint.getSsid(), accessPoint);
apMap.put(accessPoint.getSsidStr(), accessPoint);
}
} else {
// If we aren't using saved networks, drop them into the cache so that
@@ -321,7 +321,7 @@ public class WifiTracker {
}
accessPoints.add(accessPoint);
apMap.put(accessPoint.getSsid(), accessPoint);
apMap.put(accessPoint.getSsidStr(), accessPoint);
}
}
}

4
packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
View File

@@ -239,8 +239,8 @@ public class QSDetailItems extends FrameLayout {
public static class Item {
public int icon;
public Drawable overlay;
public String line1;
public String line2;
public CharSequence line1;
public CharSequence line2;
public Object tag;
public boolean canDisconnect;
}