HALO Size (2/2)

Change-Id: I630991372504b152af9dfa063c78c115c79d8c83

Conflicts:
	res/values/strings.xml
	res/xml/halo_settings.xml
	src/com/android/settings/paranoid/Halo.java
Merge branch 'jb-mr1' of https://github.com/Team-Kang-Droid/packages_apps_Settings into jb-mr1