Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9d7657c5b569e503a65f1bbe5f0e93309bf33342':
  PhoneStatusBar: Fix NPE while accessing quick settings.
This commit is contained in:
Siva Velusamy
2012-09-17 08:44:27 -07:00
committed by Android Git Automerger
parent 978f5c6a2c 9d7657c5b5
commit 0a164f8efe
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {