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

am 2b7ed31f: am fe3376b4: Fix NPE in quick settings tiles.

Browse Source 
* commit '2b7ed31f8b851a588db7c9acdae8a60b35940fe3':
  Fix NPE in quick settings tiles.
This commit is contained in:
Daniel Sandler
2012-10-16 17:26:02 -07:00
committed by Android Git Automerger
parent dad4fb5de9 2b7ed31f8b
commit c7edbf4d66
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -541,8 +541,6 @@ public class PhoneStatusBar extends BaseStatusBar {
} }
if (mSettingsPanel != null) { if (mSettingsPanel != null) {
mSettingsPanel.setBar(mStatusBarView);
if (!ActivityManager.isHighEndGfx()) { if (!ActivityManager.isHighEndGfx()) {
mSettingsPanel.setBackground(new FastColorDrawable(context.getResources().getColor( mSettingsPanel.setBackground(new FastColorDrawable(context.getResources().getColor(
R.color.notification_panel_solid_background))); R.color.notification_panel_solid_background)));
@@ -563,6 +561,7 @@ public class PhoneStatusBar extends BaseStatusBar {
mSettingsPanel.setQuickSettings(mQS); mSettingsPanel.setQuickSettings(mQS);
} }
mQS.setService(this); mQS.setService(this);
mQS.setBar(mStatusBarView);
mQS.setup(mNetworkController, mBluetoothController, mBatteryController, mQS.setup(mNetworkController, mBluetoothController, mBatteryController,
mLocationController); mLocationController);
} else { } else {