halo, tweaking

Change-Id: I35f8dc19ed5840e186989ec3cfa5529c9d39dd48

Conflicts:
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

Conflicts:
	packages/SystemUI/res/values/cm_strings.xml