From 0fa9d2d03f2825e22408cda65a9bbb88a43d9a31 Mon Sep 17 00:00:00 2001
From: Andrew Flynn <flynn@google.com>
Date: Thu, 31 May 2012 15:39:15 -0700
Subject: Refresh signal cluster for airplane switch.

This fixes a bug where if Airplane mode on/off is the only icon
that is changing in the signal cluster (for example, someone on
a wifi-only device has wifi turned on in airplane mode, so wifi
icon is not changing), this will refresh the signal cluster.

Bug: 6531918
Change-Id: I7a440b84c9dfa0b300b81d14426b99fd48fad06c
---
 .../com/android/systemui/statusbar/policy/NetworkController.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'packages/SystemUI/src')

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index 584a69e4..273076c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -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;
-- 
cgit v1.1