HALO Size (2/2)

Change-Id: I630991372504b152af9dfa063c78c115c79d8c83

Conflicts:
	res/xml/halo_settings.xml
	src/com/android/settings/paranoid/Halo.java