halo text color option

Change-Id: I0a73eb7c110f8d3deba5e344ee728f2120099071
Halo: Add master switch to disable Halo (2/2)

Change-Id: Iafde2e47f4d7fdafdf49c475eba26a8437c52089

Conflicts:
	res/xml/halo_settings.xml
	src/com/android/settings/cyanogenmod/Halo.java
settings: Add fastboot toggle

 * Add a toggle in performance settings to toggle fastboot.

Change-Id: I54bc14f188766e72723212a08a4c65c273d612c2

Conflicts:
	res/values/cm_strings.xml
sound: Enable audio thru dock devices by default

 * This should just work. A user should not be expected to dig thru
   settings in order to make their shiny new dock play some Monster
   Magnet. Turn it on by default.

Change-Id: I7a8f4fd64831e2e7206046fa2af51589060d3383
HALO: revert halo text color doesn't work this way

Change-Id: Icd0b9acfa6b38530dda1a97720a5ee7efb0ae9c2
halo: add missing halo active options

Change-Id: Ie9c5d872a5c011bf78bd82baf6c94089aa10a058
fix summary for quicksettings columns feature
fix summary of pie control

Change-Id: Ibb458f0fd17953e8504114f6e9dc777aea308fde
Merge branch 'Upstream/cm-10.2'