commit 537421bed204a3a0cb8160a9be8a61d67c2c25f4
author Siva Velusamy <vsiva@google.com> Fri Sep 14 14:45:02 2012 -0700
committer Siva Velusamy <vsiva@google.com> Fri Sep 14 14:48:58 2012 -0700
tree eb07539c20902d5b3b6ab1953525b6e007c5c75b
parent e136a72810197029a01b4e30b2063d9993b7a9ad

PhoneStatusBar: Fix NPE while accessing quick settings.

Fixes Bug 7137026

Change-Id: Id156cf8ebb1a31202015a167185a6588283128f8

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index b335b5f..ca1f82a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -318,8 +318,6 @@
             mStatusBarWindow.setBackground(null);
             mNotificationPanel.setBackground(new FastColorDrawable(context.getResources().getColor(
                     R.color.notification_panel_solid_background)));
-            mSettingsPanel.setBackground(new FastColorDrawable(context.getResources().getColor(
-                    R.color.notification_panel_solid_background)));
         }
         if (ENABLE_INTRUDERS) {
             mIntruderAlertView = (IntruderAlertView) View.inflate(context, R.layout.intruder_alert, null);
@@ -436,6 +434,11 @@
         mSettingsPanel.setup(mNetworkController, mBluetoothController, mBatteryController,
                 mLocationController);
 
+        if (!ActivityManager.isHighEndGfx()) {
+            mSettingsPanel.setBackground(new FastColorDrawable(context.getResources().getColor(
+                    R.color.notification_panel_solid_background)));
+        }
+
 //        final ImageView wimaxRSSI =
 //                (ImageView)sb.findViewById(R.id.wimax_signal);
 //        if (wimaxRSSI != null) {