Merge \\"Revert \\"Announce access point changes.\\"\\" into nyc-dev am: a64e3a0844 (de96410b) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java

+4 −16

Original line number	Diff line number	Diff line
		@@ -28,13 +28,10 @@ import android.support.v7.preference.PreferenceViewHolder;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.util.SparseArray;
		import android.view.View;
		import android.widget.TextView;

		import com.android.settingslib.R;

		import java.util.Objects;

		public class AccessPointPreference extends Preference {

		private static final int[] STATE_SECURED = {
		@@ -111,7 +108,6 @@ public class AccessPointPreference extends Preference {
		mTitleView.setCompoundDrawablePadding(mBadgePadding);
		}
		view.itemView.setContentDescription(mContentDescription);
		view.itemView.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
		}

		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().
		*/
		public void refresh() {
		boolean updated = false;
		if (mForSavedNetworks) {
		setTitle(mAccessPoint.getConfigName());
		} else {
		@@ -164,28 +159,21 @@ public class AccessPointPreference extends Preference {
		if (level != mLevel) {
		mLevel = level;
		updateIcon(mLevel, context);
		updated = true;
		notifyChanged();
		}
		updateBadge(context);

		setSummary(mForSavedNetworks ? mAccessPoint.getSavedNetworkSummary()
		: mAccessPoint.getSettingsSummary());

		CharSequence contentDescription = getTitle();
		mContentDescription = getTitle();
		if (getSummary() != null) {
		contentDescription = TextUtils.concat(contentDescription, ",", getSummary());
		mContentDescription = TextUtils.concat(mContentDescription, ",", getSummary());
		}
		if (level >= 0 && level < WIFI_CONNECTION_STRENGTH.length) {
		contentDescription = TextUtils.concat(contentDescription, ",",
		mContentDescription = TextUtils.concat(mContentDescription, ",",
		getContext().getString(WIFI_CONNECTION_STRENGTH[level]));
		}
		if (!Objects.equals(contentDescription, mContentDescription)) {
		mContentDescription = contentDescription;
		updated = true;
		}
		if (updated) {
		notifyChanged();
		}
		}

		@Override