HALO Mods (1/2)
    * Animation Controls (options)
    * Long press status info

[part 2 in android_packages_apps_Settings]

Change-Id: I96e94fee0bab3f6d90d3c33c65385642324eb60f
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/cm_strings.xml