am ef3a8021: Merge "Refresh signal cluster for airplane switch." into jb-dev

* commit 'ef3a8021e412b33db817789a9c1869022b5c901b':
  Refresh signal cluster for airplane switch.
This commit is contained in:
Andrew Flynn
2012-06-01 09:04:23 -07:00
committed by Android Git Automerger

View File

@@ -127,6 +127,7 @@ public class NetworkController extends BroadcastReceiver {
private static final int INET_CONDITION_THRESHOLD = 50;
private boolean mAirplaneMode = false;
private boolean mLastAirplaneMode = true;
// our ui
Context mContext;
@@ -1062,7 +1063,8 @@ public class NetworkController extends BroadcastReceiver {
|| mLastDataDirectionOverlayIconId != combinedActivityIconId
|| mLastWifiIconId != mWifiIconId
|| mLastWimaxIconId != mWimaxIconId
|| mLastDataTypeIconId != mDataTypeIconId)
|| mLastDataTypeIconId != mDataTypeIconId
|| mLastAirplaneMode != mAirplaneMode)
{
// NB: the mLast*s will be updated later
for (SignalCluster cluster : mSignalClusters) {
@@ -1070,6 +1072,10 @@ public class NetworkController extends BroadcastReceiver {
}
}
if (mLastAirplaneMode != mAirplaneMode) {
mLastAirplaneMode = mAirplaneMode;
}
// the phone icon on phones
if (mLastPhoneSignalIconId != mPhoneSignalIconId) {
mLastPhoneSignalIconId = mPhoneSignalIconId;