Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received

Browse Source 
* commit '6f0394a3b4d6082c9cb01de4a220a3b082e1840a':
  DO NOT MERGE SystemUI: update signal level when broadcast is received
This commit is contained in:
TK MUN
2011-05-23 14:47:38 -07:00
committed by Android Git Automerger
parent 5b9ec6871a 6f0394a3b4
commit 59c87cb607
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
View File

@@ -512,10 +512,10 @@ public class StatusBarPolicy {
private static final int sWimaxDisconnectedImg = private static final int sWimaxDisconnectedImg =
R.drawable.stat_sys_data_wimax_signal_disconnected; R.drawable.stat_sys_data_wimax_signal_disconnected;
private static final int sWimaxIdleImg = R.drawable.stat_sys_data_wimax_signal_idle; private static final int sWimaxIdleImg = R.drawable.stat_sys_data_wimax_signal_idle;
private boolean mIsWimaxConnected = false;
private boolean mIsWimaxEnabled = false; private boolean mIsWimaxEnabled = false;
private int mWimaxSignal = 0; private int mWimaxSignal = 0;
private int mWimaxState = 0; private int mWimaxState = 0;
private int mWimaxExtraState = 0;
// state of inet connection - 0 not connected, 100 connected // state of inet connection - 0 not connected, 100 connected
private int mInetCondition = 0; private int mInetCondition = 0;
@@ -940,12 +940,6 @@ public class StatusBarPolicy {
break; break;
case ConnectivityManager.TYPE_WIMAX: case ConnectivityManager.TYPE_WIMAX:
mInetCondition = inetCondition; mInetCondition = inetCondition;
if (info.isConnected()) {
mIsWimaxConnected = true;
mService.setIconVisibility("wimax", true);
} else {
mIsWimaxConnected = false;
}
updateWiMAX(intent); updateWiMAX(intent);
break; break;
} }
@@ -1332,10 +1326,10 @@ public class StatusBarPolicy {
final String action = intent.getAction(); final String action = intent.getAction();
int iconId = sWimaxDisconnectedImg; int iconId = sWimaxDisconnectedImg;
if (action.equals(WimaxManagerConstants. WIMAX_ENABLED_STATUS_CHANGED)) { if (action.equals(WimaxManagerConstants.WIMAX_ENABLED_STATUS_CHANGED)) {
int mWimaxStatus = intent.getIntExtra(WimaxManagerConstants.EXTRA_WIMAX_STATUS, int wimaxStatus = intent.getIntExtra(WimaxManagerConstants.EXTRA_WIMAX_STATUS,
WimaxManagerConstants.WIMAX_STATUS_DISABLED); WimaxManagerConstants.WIMAX_STATUS_DISABLED);
switch(mWimaxStatus) { switch(wimaxStatus) {
case WimaxManagerConstants.WIMAX_STATUS_ENABLED: case WimaxManagerConstants.WIMAX_STATUS_ENABLED:
mIsWimaxEnabled = true; mIsWimaxEnabled = true;
break; break;
@@ -1343,31 +1337,29 @@ public class StatusBarPolicy {
mIsWimaxEnabled = false; mIsWimaxEnabled = false;
break; break;
} }
mService.setIconVisibility("wimax", mIsWimaxEnabled);
} else if (action.equals(WimaxManagerConstants.SIGNAL_LEVEL_CHANGED_ACTION)) { } else if (action.equals(WimaxManagerConstants.SIGNAL_LEVEL_CHANGED_ACTION)) {
mWimaxSignal = intent.getIntExtra(WimaxManagerConstants.EXTRA_NEW_SIGNAL_LEVEL, 0); mWimaxSignal = intent.getIntExtra(WimaxManagerConstants.EXTRA_NEW_SIGNAL_LEVEL, 0);
} else if (action.equals(WimaxManagerConstants.WIMAX_STATE_CHANGED_ACTION)) { } else if (action.equals(WimaxManagerConstants.WIMAX_STATE_CHANGED_ACTION)) {
mWimaxState = intent.getIntExtra(WimaxManagerConstants.EXTRA_WIMAX_STATE, mWimaxState = intent.getIntExtra(WimaxManagerConstants.EXTRA_WIMAX_STATE,
WimaxManagerConstants.WIMAX_STATE_UNKNOWN); WimaxManagerConstants.WIMAX_STATE_UNKNOWN);
int mExtraWimaxState = intent.getIntExtra( mWimaxExtraState = intent.getIntExtra(
WimaxManagerConstants.EXTRA_WIMAX_STATE_DETAIL, WimaxManagerConstants.EXTRA_WIMAX_STATE_DETAIL,
WimaxManagerConstants.WIMAX_DEREGISTRATION); WimaxManagerConstants.WIMAX_DEREGISTRATION);
switch(mWimaxState) {
case WimaxManagerConstants.WIMAX_STATE_DISCONNECTED:
iconId = sWimaxDisconnectedImg;
break;
case WimaxManagerConstants.WIMAX_STATE_CONNECTED:
if(mExtraWimaxState == WimaxManagerConstants.WIMAX_IDLE) {
iconId = sWimaxIdleImg;
}
else {
iconId = sWimaxSignalImages[mInetCondition][mWimaxSignal];
}
break;
}
mService.setIcon("wimax", iconId, 0);
} }
mService.setIconVisibility("wimax", mIsWimaxEnabled); 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;
}
if (mIsWimaxEnabled) mService.setIcon("wimax", iconId, 0);
} }
private final void updateGps(Intent intent) { private final void updateGps(Intent intent) {