HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]

Change-Id: I7457c9598d55eb3b9c9baec7e1e9e239b68215ad

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/halo_settings.xml
	src/com/android/settings/cyanogenmod/HaloSettings.java
Halo (2/2)

Change-Id: Ibe10027ee53172646d70386a00175299c4e56aae

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/halo_settings.xml
	src/com/android/settings/cyanogenmod/HaloSettings.java
Halo size (2/2) - This commit complements this: 3f401366b68197d1c1a583c44aeb798d010de625

Change-Id: I668f454fb082ed7d43222a8d2dad0779c76bdc84

Conflicts:

	res/values/cm_arrays.xml