From 537421bed204a3a0cb8160a9be8a61d67c2c25f4 Mon Sep 17 00:00:00 2001 From: Siva Velusamy Date: Fri, 14 Sep 2012 14:45:02 -0700 Subject: [PATCH] PhoneStatusBar: Fix NPE while accessing quick settings. Fixes Bug 7137026 Change-Id: Id156cf8ebb1a31202015a167185a6588283128f8 --- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 b335b5ff6b349..ca1f82a067e53 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 @@ public class PhoneStatusBar extends BaseStatusBar { 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 @@ public class PhoneStatusBar extends BaseStatusBar { 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) {