Revert "Some Halo color options"

This reverts commit c9df2111f869343c65e7eb8dc4a44aa122f0c7bb.

Conflicts:

	res/xml/user_interface_settings.xml
	src/com/android/settings/UserInterface.java