diff options
| author | 2012-09-17 08:42:04 -0700 | |
|---|---|---|
| committer | 2012-09-17 08:42:05 -0700 | |
| commit | 9d7657c5b569e503a65f1bbe5f0e93309bf33342 (patch) | |
| tree | c1e8b17308b4e77feaecd50f4dabbfd52cc3bbeb | |
| parent | b181909eefeb8c9b675b1ca25768dcddde9ea0b8 (diff) | |
| parent | 537421bed204a3a0cb8160a9be8a61d67c2c25f4 (diff) | |
Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 7 |
1 files 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 b335b5ff6b34..ca1f82a067e5 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) { |