better halo color strings
Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	res/values/strings.xml
OOps ont the last one
Revert "OOps ont the last one"

This reverts commit 0fd6e0c9304eb2a39cd264ce61145f7ea87d7b82.
Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit c3431356438392e619b38b599ba0bfd5faef817b.

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	src/com/android/settings/saber/UserInterface.java
update halo strings
remove orphan dependancy
better halo colo strings
Remove privacy guard fragment in onDestroyView

Change-Id: I61cebe273fa6fd514f18c86894acd176701148f6
trying to be smart but derp