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

Merge "Revert "Announce access point changes."" into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-06-14 20:42:14 +00:00
committed by Android (Google) Code Review
parent 2f4636a333 8897a5044b
commit a64e3a0844
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
View File

@@ -28,13 +28,10 @@ import android.support.v7.preference.PreferenceViewHolder;
import android.text.TextUtils; 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.widget.TextView; import android.widget.TextView;
import com.android.settingslib.R; import com.android.settingslib.R;
import java.util.Objects;
public class AccessPointPreference extends Preference { public class AccessPointPreference extends Preference {
private static final int[] STATE_SECURED = { private static final int[] STATE_SECURED = {
@@ -111,7 +108,6 @@ public class AccessPointPreference extends Preference {
mTitleView.setCompoundDrawablePadding(mBadgePadding); mTitleView.setCompoundDrawablePadding(mBadgePadding);
} }
view.itemView.setContentDescription(mContentDescription); view.itemView.setContentDescription(mContentDescription);
view.itemView.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
} }
protected void updateIcon(int level, Context context) { protected void updateIcon(int level, Context context) {
@@ -152,7 +148,6 @@ public class AccessPointPreference extends Preference {
* Updates the title and summary; may indirectly call notifyChanged(). * Updates the title and summary; may indirectly call notifyChanged().
*/ */
public void refresh() { public void refresh() {
boolean updated = false;
if (mForSavedNetworks) { if (mForSavedNetworks) {
setTitle(mAccessPoint.getConfigName()); setTitle(mAccessPoint.getConfigName());
} else { } else {
@@ -164,28 +159,21 @@ public class AccessPointPreference extends Preference {
if (level != mLevel) { if (level != mLevel) {
mLevel = level; mLevel = level;
updateIcon(mLevel, context); updateIcon(mLevel, context);
updated = true; notifyChanged();
} }
updateBadge(context); updateBadge(context);
setSummary(mForSavedNetworks ? mAccessPoint.getSavedNetworkSummary() setSummary(mForSavedNetworks ? mAccessPoint.getSavedNetworkSummary()
: mAccessPoint.getSettingsSummary()); : mAccessPoint.getSettingsSummary());
CharSequence contentDescription = getTitle(); mContentDescription = getTitle();
if (getSummary() != null) { if (getSummary() != null) {
contentDescription = TextUtils.concat(contentDescription, ",", getSummary()); mContentDescription = TextUtils.concat(mContentDescription, ",", getSummary());
} }
if (level >= 0 && level < WIFI_CONNECTION_STRENGTH.length) { if (level >= 0 && level < WIFI_CONNECTION_STRENGTH.length) {
contentDescription = TextUtils.concat(contentDescription, ",", mContentDescription = TextUtils.concat(mContentDescription, ",",
getContext().getString(WIFI_CONNECTION_STRENGTH[level])); getContext().getString(WIFI_CONNECTION_STRENGTH[level]));
} }
if (!Objects.equals(contentDescription, mContentDescription)) {
mContentDescription = contentDescription;
updated = true;
}
if (updated) {
notifyChanged();
}
} }
@Override @Override