Heads up: option to disable in lockscreen (2/2)

Change-Id: If1311256b57d47fcdd627cadd6349627dc6507ad

Conflicts:
	res/values/liquid_strings.xml->candy_strings.xml
	src/com/android/settings/candykat/HeadsUp.java

 Author:    cristianomatos <cristianobmatos@gmail.com>
Hover: exclude from lock screen (2/2)

Enable/disable hover notifications from lock screen

Change-Id: I011cfe31adae06e7ec43e08d9d8286cd9b554540

Conflicts:
	res/values/liquid_strings.xml->candy_strings.xml
	res/xml/hover_settings.xml

 Author:    cristianomatos <cristianobmatos@gmail.com>
HOVER: touch to hide (2/2)

- Allow users to configure touching outside to instant hide HOVER notifications

Change-Id: I04cce2e5f2fe8b66e725471baf027f7ca9838468

Conflicts:
	res/values/liquid_strings.xml->candy_strings.xml
	res/values/slim_arrays.xml->candy_arrays.xml

 Author:    cristianomatos <cristianobmatos@gmail.com>
Hover touch to hide: Add dependency

Change-Id: I765e08dc9a5cba43e496d878fbf67046c4e26177