Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev

Author: vsiva

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

@@ -318,8 +318,6 @@ public boolean onTouch(View v, MotionEvent event) {
             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 void onSizeChanged(View view, int w, int h, int oldw, int oldh) {
         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) {