am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread

Merge commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8' into gingerbread-plus-aosp

* commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8':
  Fix statusbar display of wifi signalstrength
This commit is contained in:
Irfan Sheriff
2010-09-13 16:08:12 -07:00
committed by Android Git Automerger

View File

@@ -718,7 +718,6 @@ public class StatusBarPolicy {
iconId = sWifiSignalImages[mLastWifiInetConnectivityState] iconId = sWifiSignalImages[mLastWifiInetConnectivityState]
[mLastWifiSignalLevel]; [mLastWifiSignalLevel];
} }
mService.setIcon("wifi", iconId, 0); 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);
@@ -1101,7 +1100,7 @@ public class StatusBarPolicy {
int iconId; int iconId;
final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200); final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);
int newSignalLevel = WifiManager.calculateSignalLevel(newRssi, int newSignalLevel = WifiManager.calculateSignalLevel(newRssi,
sWifiSignalImages.length); sWifiSignalImages[0].length);
if (newSignalLevel != mLastWifiSignalLevel) { if (newSignalLevel != mLastWifiSignalLevel) {
mLastWifiSignalLevel = newSignalLevel; mLastWifiSignalLevel = newSignalLevel;
if (mIsWifiConnected) { if (mIsWifiConnected) {