Merge "DO NOT MERGE Fix wifi status icon" into gingerbread

This commit is contained in:
Irfan Sheriff
2010-08-15 15:57:47 -07:00
committed by Android (Google) Code Review

View File

@@ -1033,6 +1033,7 @@ public class StatusBarPolicy {
iconId = sWifiSignalImages[mLastWifiSignalLevel]; iconId = sWifiSignalImages[mLastWifiSignalLevel];
} }
mService.setIcon("wifi", iconId, 0);
// Show the icon since wi-fi is connected // Show the icon since wi-fi is connected
mService.setIconVisibility("wifi", true); mService.setIconVisibility("wifi", true);
@@ -1041,11 +1042,11 @@ public class StatusBarPolicy {
mIsWifiConnected = false; mIsWifiConnected = false;
iconId = sWifiSignalImages[0]; iconId = sWifiSignalImages[0];
mService.setIcon("wifi", iconId, 0);
// Hide the icon since we're not connected // Hide the icon since we're not connected
mService.setIconVisibility("wifi", false); mService.setIconVisibility("wifi", false);
} }
mService.setIcon("wifi", iconId, 0);
} else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) { } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) {
int iconId; int iconId;
final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200); final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);