Add volume rocker with proximity sensor changes 2/2

Change-Id: I1af2e47dce6c668d7ec9f246f86dda3d1a95fe60
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/bs_strings.xml
	res/xml/general_settings.xml
	src/com/android/settings/beanstalk/GeneralSettings.java
added strings for weaponX settings
[1/2] Settings: HALO

Forward port from jb43.

PS1: Initial port
PS2: Fix conflicts with notification LED
PS3: FIx derp in strings
PS4: Fix derp in pa_arrays (tag not closed)
PS5: HALO Mods

Change-Id: I7de6a9157415fe05b0a59d8260e33cc1527a342d
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	AndroidManifest.xml
	res/layout/installed_app_details.xml
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:
	res/xml/settings_headers.xml

Conflicts:
	res/layout/installed_app_details.xml
	res/values/bs_arrays.xml
	res/values/bs_strings.xml
	res/xml/settings_headers.xml
Add Halo and clean code
get rid of leftovers