number patches

Change-Id: I9aaae99def28d588fc1e12a4be19e31fbcbde438

Conflicts:
	packages/SystemUI/res/layout/halo_layout.xml
	packages/SystemUI/src/com/android/systemui/statusbar/Halo.java