Merge "Move AccessPointPreference to SettingsLib" (6d70e7dc) · Commits · e / os / android_packages_apps_Settings

res/values/attrs.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -15,9 +15,6 @@
		-->

		<resources>
		<declare-styleable name="WifiEncryptionState">
		<attr name="state_encrypted" format="boolean" />
		</declare-styleable>
		<declare-styleable name="IconPreferenceScreen">
		<attr name="icon" />
		</declare-styleable>

res/values/dimens.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,6 @@

		<!-- WiFi Preferences -->
		<dimen name="wifi_divider_height">1px</dimen>
		<dimen name="wifi_preference_badge_padding">8dip</dimen>

		<!-- Color picker -->
		<dimen name="color_swatch_size">16dp</dimen>

res/values/themes.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@
		<attr name="setup_divider_color" format="reference" />
		<attr name="side_margin" format="reference\|dimension" />
		<attr name="wifi_signal_color" format="reference" />
		<attr name="wifi_signal" format="reference" />

		<style name="SetupWizardDisableAppStartingTheme">
		<!-- Theme to disable the app starting window. The actual theme of the activity needs to

res/xml/wifi_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@

		<!-- Needed so PreferenceGroupAdapter allows AccessPointPreference to be
		recycled. Removed in onResume -->
		<com.android.settings.wifi.AccessPointPreference
		<com.android.settings.wifi.LongPressAccessPointPreference
		android:key="dummy" />

		</PreferenceScreen>

src/com/android/settings/wifi/AccessPointPreference.java

deleted100644 → 0

+0 −235

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings.wifi;

		import android.app.Fragment;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.StateListDrawable;
		import android.net.wifi.WifiConfiguration;
		import android.os.Looper;
		import android.os.UserHandle;
		import android.support.v7.preference.Preference;
		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.settings.R;
		import com.android.settingslib.wifi.AccessPoint;

		public class AccessPointPreference extends Preference {

		private static final int[] STATE_SECURED = {
		R.attr.state_encrypted
		};
		private static final int[] STATE_NONE = {};

		private static int[] wifi_signal_attributes = { R.attr.wifi_signal };

		private final StateListDrawable mWifiSld;
		private final int mBadgePadding;
		private final UserBadgeCache mBadgeCache;

		private final Fragment mFragment;

		private TextView mTitleView;
		private boolean mForSavedNetworks = false;
		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) {
		super(context, attrs);
		mWifiSld = null;
		mBadgePadding = 0;
		mBadgeCache = null;
		mFragment = null;
		}

		public AccessPointPreference(AccessPoint accessPoint, Context context, UserBadgeCache cache,
		boolean forSavedNetworks, Fragment fragment) {
		super(context);
		mFragment = fragment;
		mBadgeCache = cache;
		mAccessPoint = accessPoint;
		mForSavedNetworks = forSavedNetworks;
		mAccessPoint.setTag(this);
		mLevel = -1;

		mWifiSld = (StateListDrawable) context.getTheme()
		.obtainStyledAttributes(wifi_signal_attributes).getDrawable(0);

		// Distance from the end of the title at which this AP's user badge should sit.
		mBadgePadding = context.getResources()
		.getDimensionPixelSize(R.dimen.wifi_preference_badge_padding);
		refresh();
		}

		public AccessPoint getAccessPoint() {
		return mAccessPoint;
		}

		@Override
		public void onBindViewHolder(final PreferenceViewHolder view) {
		super.onBindViewHolder(view);
		if (mFragment != null) {
		view.itemView.setOnCreateContextMenuListener(mFragment);
		view.itemView.setTag(this);
		view.itemView.setLongClickable(true);
		}
		if (mAccessPoint == null) {
		// Used for dummy pref.
		return;
		}
		Drawable drawable = getIcon();
		if (drawable != null) {
		drawable.setLevel(mLevel);
		}

		mTitleView = (TextView) view.findViewById(com.android.internal.R.id.title);
		if (mTitleView != null) {
		// Attach to the end of the title view
		mTitleView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mBadge, null);
		mTitleView.setCompoundDrawablePadding(mBadgePadding);
		}
		view.itemView.setContentDescription(mContentDescription);
		}

		protected void updateIcon(int level, Context context) {
		if (level == -1) {
		setIcon(null);
		} else {
		if (getIcon() == null) {
		// To avoid a drawing race condition, we first set the state (SECURE/NONE) and then
		// set the icon (drawable) to that state's drawable.
		// If sld is null then we are indexing and therefore do not have access to
		// (nor need to display) the drawable.
		if (mWifiSld != null) {
		mWifiSld.setState((mAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE)
		? STATE_SECURED
		: STATE_NONE);
		Drawable drawable = mWifiSld.getCurrent();
		if (!mForSavedNetworks) {
		setIcon(drawable);
		} else {
		setIcon(null);
		}
		}
		}
		}
		}

		protected void updateBadge(Context context) {
		WifiConfiguration config = mAccessPoint.getConfig();
		if (config != null) {
		// Fetch badge (may be null)
		// Get the badge using a cache since the PM will ask the UserManager for the list
		// of profiles every time otherwise.
		mBadge = mBadgeCache.getUserBadge(config.creatorUid);
		}
		}

		/**
		* Updates the title and summary; may indirectly call notifyChanged().
		*/
		public void refresh() {
		if (mForSavedNetworks) {
		setTitle(mAccessPoint.getConfigName());
		} else {
		setTitle(mAccessPoint.getSsid());
		}

		final Context context = getContext();
		int level = mAccessPoint.getLevel();
		if (level != mLevel) {
		mLevel = level;
		updateIcon(mLevel, context);
		notifyChanged();
		}
		updateBadge(context);

		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
		protected void notifyChanged() {
		if (Looper.getMainLooper() != Looper.myLooper()) {
		// Let our BG thread callbacks call setTitle/setSummary.
		postNotifyChanged();
		} else {
		super.notifyChanged();
		}
		}

		public void onLevelChanged() {
		postNotifyChanged();
		}

		private void postNotifyChanged() {
		if (mTitleView != null) {
		mTitleView.post(mNotifyChanged);
		} // Otherwise we haven't been bound yet, and don't need to update.
		}

		private final Runnable mNotifyChanged = new Runnable() {
		@Override
		public void run() {
		notifyChanged();
		}
		};

		public static class UserBadgeCache {
		private final SparseArray<Drawable> mBadges = new SparseArray<>();
		private final PackageManager mPm;

		UserBadgeCache(PackageManager pm) {
		mPm = pm;
		}

		private Drawable getUserBadge(int userId) {
		int index = mBadges.indexOfKey(userId);
		if (index < 0) {
		Drawable badge = mPm.getUserBadgeForDensity(new UserHandle(userId), 0 /* dpi */);
		mBadges.put(userId, badge);
		return badge;
		}
		return mBadges.valueAt(index);
		}
		}
		}