Halo: allow choose notifications on floating window or not (2/2)

Change-Id: I27953a6cd25248e07f4ed18a0db459b7c2f68cc5

Conflicts:
	res/values/cr_strings.xml
	res/xml/halo_settings.xml
	src/com/android/settings/crdroid/Halo.java