1 files changed, 19 insertions, 2 deletions

diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index afeb592..1690bcb 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -59,6 +59,7 @@ import android.util.EventLog;
 import android.util.Log;
 import android.util.Config;
 import com.android.internal.app.IBatteryStats;
+import com.android.internal.app.ThemeUtils;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -201,6 +202,8 @@ public class WifiStateTracker extends NetworkStateTracker {
     public static final int SUPPL_SCAN_HANDLING_NORMAL = 1;
     public static final int SUPPL_SCAN_HANDLING_LIST_ONLY = 2;
 
+    private Context mUiContext;
+
     private WifiMonitor mWifiMonitor;
     private WifiInfo mWifiInfo;
     private List<ScanResult> mScanResults;
@@ -421,6 +424,13 @@ public class WifiStateTracker extends NetworkStateTracker {
                 }
             },new IntentFilter(ACTION_DHCP_RENEW));
 
+        ThemeUtils.registerThemeChangeReceiver(mContext, new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                mUiContext = null;
+            }
+        });
+
         PowerManager powerManager = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
         mDhcpRenewWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_TAG);
 
@@ -2399,7 +2409,7 @@ public class WifiStateTracker extends NetworkStateTracker {
             CharSequence details = mContext.getResources().getQuantityText(
                     com.android.internal.R.plurals.wifi_available_detailed, numNetworks);
             mNotification.tickerText = title;
-            mNotification.setLatestEventInfo(mContext, title, details, mNotification.contentIntent);
+            mNotification.setLatestEventInfo(getUiContext(), title, details, mNotification.contentIntent);
             
             mNotificationRepeatTime = System.currentTimeMillis() + NOTIFICATION_REPEAT_DELAY_MS;
 
@@ -2430,7 +2440,14 @@ public class WifiStateTracker extends NetworkStateTracker {
         mNotificationRepeatTime = 0;
         mNumScansSinceNetworkStateChange = 0;
     }
-    
+
+    private Context getUiContext() {
+        if (mUiContext == null) {
+            mUiContext = ThemeUtils.createUiContext(mContext);
+        }
+        return mUiContext != null ? mUiContext : mContext;
+    }
+
     @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();