am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit 'fd44d346bcaae6e8267aa4767ad70037d436e1e4':
Add content description to wifi networks
diff --git a/src/com/android/settings/wifi/AccessPointPreference.java b/src/com/android/settings/wifi/AccessPointPreference.java
index b9612a3..264f681 100644
--- a/src/com/android/settings/wifi/AccessPointPreference.java
+++ b/src/com/android/settings/wifi/AccessPointPreference.java
@@ -23,6 +23,7 @@
import android.os.Looper;
import android.os.UserHandle;
import android.preference.Preference;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.SparseArray;
import android.view.View;
@@ -49,6 +50,14 @@
private AccessPoint mAccessPoint;
private Drawable mBadge;
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.
public AccessPointPreference(Context context, AttributeSet attrs) {
@@ -98,6 +107,7 @@
mTitleView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mBadge, null);
mTitleView.setCompoundDrawablePadding(mBadgePadding);
}
+ view.setContentDescription(mContentDescription);
}
protected void updateIcon(int level, Context context) {
@@ -155,6 +165,15 @@
setSummary(mForSavedNetworks ? mAccessPoint.getSavedNetworkSummary()
: 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