HALO Size (1/2)

Change-Id: I2780dfee66b0b80b57c62b83c40609104fe3c279

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/halo_bubble.xml
	packages/SystemUI/res/layout/halo_speech.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java

Conflicts:
	packages/SystemUI/res/layout/halo_number.xml
	packages/SystemUI/res/layout/halo_speech.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
merge conflicts