Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d7657c5 authored by Siva Velusamy's avatar Siva Velusamy Committed by Android (Google) Code Review
Browse files

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

parents b181909e 537421be

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

+5 −2
Original line number Diff line number Diff line
@@ -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) {