diff options
| author | Scott Brady <sbradymobile@gmail.com> | 2011-09-01 11:43:55 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-09-24 12:27:16 -0700 |
| commit | ea348b23375e208cb818c533244c45eee03b9d8b (patch) | |
| tree | b2df878f837a905b90e7d877c7b2de646b3adcab /packages | |
| parent | e8c81e01be9cbae98be4684b3f2644beeb446126 (diff) | |
| download | frameworks_base-ea348b23375e208cb818c533244c45eee03b9d8b.zip frameworks_base-ea348b23375e208cb818c533244c45eee03b9d8b.tar.gz frameworks_base-ea348b23375e208cb818c533244c45eee03b9d8b.tar.bz2 | |
Fix for WiMAX signal indicator icon after 2.3.5 merge
The supersonic does not appear to use WIMAX_STATE_CHANGED_ACTION
intent, so the icon does not update from the disconnected state
(iconId = sWimaxDisconnectedImg and mWimaxState = 0 so the
switch(mWimaxState) statement does not change the iconId).
This fix uses the NETWORK_STATE_CHANGED_ACTION intent to set
mWimaxState and mWimaxExtraState so the switch(mWimaxState)
statement sets the iconId for the connection state.
Change-Id: Id2356e10c67d85248d13a82934dbb21a3fe37532
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java index d09ab9c..b41d0b7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java @@ -1516,31 +1516,18 @@ public class StatusBarPolicy { mWimaxExtraState = intent.getIntExtra( WimaxManagerConstants.EXTRA_WIMAX_STATE_DETAIL, WimaxManagerConstants.WIMAX_DEREGISTRATION); - - switch(mWimaxState) { - case WimaxManagerConstants.WIMAX_STATE_DISCONNECTED: - iconId = sWimaxDisconnectedImg; - break; - case WimaxManagerConstants.WIMAX_STATE_CONNECTED: - if(mWimaxExtraState == WimaxManagerConstants.WIMAX_IDLE) { - iconId = sWimaxIdleImg; - } - else { - iconId = sWimaxSignalImages[mInetCondition][mWimaxSignal]; - } - break; - } - mService.setIcon("wimax", iconId, 0); } else if (action.equals(WimaxManagerConstants.NETWORK_STATE_CHANGED_ACTION)) { final NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(WimaxManagerConstants.EXTRA_NETWORK_INFO); if (networkInfo != null && networkInfo.isConnected()) { - iconId = sWimaxSignalImages[mInetCondition][mWimaxSignal]; + mWimaxState = WimaxManagerConstants.WIMAX_STATE_CONNECTED; + mWimaxExtraState = WimaxManagerConstants.WIMAX_STATE_UNKNOWN; } else if (networkInfo != null && networkInfo.isAvailable()) { - iconId = sWimaxIdleImg; + mWimaxState = WimaxManagerConstants.WIMAX_STATE_CONNECTED; + mWimaxExtraState = WimaxManagerConstants.WIMAX_IDLE; } else { - iconId = sWimaxDisconnectedImg; + mWimaxState = WimaxManagerConstants.WIMAX_STATE_DISCONNECTED; + mWimaxExtraState = WimaxManagerConstants.WIMAX_STATE_UNKNOWN; } - mService.setIcon("wimax", iconId, 0); } switch(mWimaxState) { case WimaxManagerConstants.WIMAX_STATE_DISCONNECTED: |