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

am d03f041a: am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev

Browse Source 
* commit 'd03f041a06af8fe31c7fffd4aa9c975e2b5151e6':
  Add content description to wifi networks
This commit is contained in:
Jason Monk
2015-07-14 21:02:18 +00:00
committed by Android Git Automerger
parent bd5ae86579 d03f041a06
commit 4f7e1968ea
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/AccessPointPreference.java
View File

@@ -23,6 +23,7 @@ import android.net.wifi.WifiConfiguration;
import android.os.Looper; import android.os.Looper;
import android.os.UserHandle; import android.os.UserHandle;
import android.preference.Preference; import android.preference.Preference;
import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.View; import android.view.View;
@@ -49,6 +50,14 @@ public class AccessPointPreference extends Preference {
private AccessPoint mAccessPoint; private AccessPoint mAccessPoint;
private Drawable mBadge; private Drawable mBadge;
private int mLevel; private int mLevel;
private CharSequence mContentDescription;
static final int[] WIFI_CONNECTION_STRENGTH = {
R.string.accessibility_wifi_one_bar,
R.string.accessibility_wifi_two_bars,
R.string.accessibility_wifi_three_bars,
R.string.accessibility_wifi_signal_full
};
// Used for dummy pref. // Used for dummy pref.
public AccessPointPreference(Context context, AttributeSet attrs) { public AccessPointPreference(Context context, AttributeSet attrs) {
@@ -98,6 +107,7 @@ public class AccessPointPreference extends Preference {
mTitleView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mBadge, null); mTitleView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mBadge, null);
mTitleView.setCompoundDrawablePadding(mBadgePadding); mTitleView.setCompoundDrawablePadding(mBadgePadding);
} }
view.setContentDescription(mContentDescription);
} }
protected void updateIcon(int level, Context context) { protected void updateIcon(int level, Context context) {
@@ -155,6 +165,15 @@ public class AccessPointPreference extends Preference {
setSummary(mForSavedNetworks ? mAccessPoint.getSavedNetworkSummary() setSummary(mForSavedNetworks ? mAccessPoint.getSavedNetworkSummary()
: mAccessPoint.getSettingsSummary()); : mAccessPoint.getSettingsSummary());
mContentDescription = getTitle();
if (getSummary() != null) {
mContentDescription = TextUtils.concat(mContentDescription, ",", getSummary());
}
if (level >= 0 && level < WIFI_CONNECTION_STRENGTH.length) {
mContentDescription = TextUtils.concat(mContentDescription, ",",
getContext().getString(WIFI_CONNECTION_STRENGTH[level]));
}
} }
@Override @Override