am 4ba77f16: am ef3a8021: Merge "Refresh signal cluster for airplane switch." into jb-dev (d4354cb5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -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;