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

Fixed wifi refresh bug, b/5021754

Browse Source 
Change-Id: I93711094ceb1490accce1e466de4cc1541dffdff
This commit is contained in:
Isaac Levy
2011-08-24 16:41:10 -07:00
parent 5070e45a87
commit e2c6e7520b
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/wifi/AccessPoint.java
View File

@@ -71,7 +71,6 @@ class AccessPoint extends Preference {
private int mRssi; private int mRssi;
private WifiInfo mInfo; private WifiInfo mInfo;
private DetailedState mState; private DetailedState mState;
private ImageView mSignal;
static int getSecurity(WifiConfiguration config) { static int getSecurity(WifiConfiguration config) {
if (config.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) { if (config.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
@@ -145,12 +144,14 @@ class AccessPoint extends Preference {
super(context); super(context);
setWidgetLayoutResource(R.layout.preference_widget_wifi_signal); setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
loadConfig(config); loadConfig(config);
refresh();
} }
AccessPoint(Context context, ScanResult result) { AccessPoint(Context context, ScanResult result) {
super(context); super(context);
setWidgetLayoutResource(R.layout.preference_widget_wifi_signal); setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
loadResult(result); loadResult(result);
refresh();
} }
AccessPoint(Context context, Bundle savedState) { AccessPoint(Context context, Bundle savedState) {
@@ -204,17 +205,16 @@ class AccessPoint extends Preference {
@Override @Override
protected void onBindView(View view) { protected void onBindView(View view) {
setTitle(ssid); super.onBindView(view);
mSignal = (ImageView) view.findViewById(R.id.signal); ImageView signal = (ImageView) view.findViewById(R.id.signal);
if (mRssi == Integer.MAX_VALUE) { if (mRssi == Integer.MAX_VALUE) {
mSignal.setImageDrawable(null); signal.setImageDrawable(null);
} else { } else {
mSignal.setImageResource(R.drawable.wifi_signal); signal.setImageLevel(getLevel());
mSignal.setImageState((security != SECURITY_NONE) ? signal.setImageResource(R.drawable.wifi_signal);
signal.setImageState((security != SECURITY_NONE) ?
STATE_SECURED : STATE_NONE, true); STATE_SECURED : STATE_NONE, true);
} }
refresh();
super.onBindView(view);
} }
@Override @Override
@@ -245,14 +245,19 @@ class AccessPoint extends Preference {
} }
boolean update(ScanResult result) { boolean update(ScanResult result) {
// We do not call refresh() since this is called before onBindView().
if (ssid.equals(result.SSID) && security == getSecurity(result)) { if (ssid.equals(result.SSID) && security == getSecurity(result)) {
if (WifiManager.compareSignalLevel(result.level, mRssi) > 0) { if (WifiManager.compareSignalLevel(result.level, mRssi) > 0) {
int oldLevel = getLevel();
mRssi = result.level; mRssi = result.level;
if (getLevel() != oldLevel) {
notifyChanged();
}
} }
// This flag only comes from scans, is not easily saved in config // This flag only comes from scans, is not easily saved in config
if (security == SECURITY_PSK) if (security == SECURITY_PSK) {
pskType = getPskType(result); pskType = getPskType(result);
}
refresh();
return true; return true;
} }
return false; return false;
@@ -260,7 +265,8 @@ class AccessPoint extends Preference {
void update(WifiInfo info, DetailedState state) { void update(WifiInfo info, DetailedState state) {
boolean reorder = false; boolean reorder = false;
if (info != null && networkId != -1 && networkId == info.getNetworkId()) { if (info != null && networkId != WifiConfiguration.INVALID_NETWORK_ID
&& networkId == info.getNetworkId()) {
reorder = (mInfo == null); reorder = (mInfo == null);
mRssi = info.getRssi(); mRssi = info.getRssi();
mInfo = info; mInfo = info;
@@ -309,13 +315,11 @@ class AccessPoint extends Preference {
return "\"" + string + "\""; return "\"" + string + "\"";
} }
/** Updates the title and summary; may indirectly call notifyChanged() */
private void refresh() { private void refresh() {
if (mSignal == null) { setTitle(ssid);
return;
}
Context context = getContext();
mSignal.setImageLevel(getLevel());
Context context = getContext();
if (mState != null) { // This is the active connection if (mState != null) { // This is the active connection
setSummary(Summary.get(context, mState)); setSummary(Summary.get(context, mState));
} else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range