Maybe fix for battery icons

Change-Id: I04d23f739025e8803de0fda7f706bb48a46c5f71
Revert "Revert "Notification Shortcuts & WiFi display (1 of 2) - Port from Slimroms (Slim Bean)""

This reverts commit 3a8e2996f47ef6ec352353185725dc27b20ab783.

Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: Ia5f132af90bfdc031a4e3ecb5a03782cf089c37b
Merge remote-tracking branch 'github/Domination' into Domination