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
trying to fix quiet hours
-original commit- 57148fed99f987b4d2b258205804ac90aeada194
Settings: allow device trees to invoke custom display settings

in this case gesture control settings.

Intent used: com.slim.action.LAUNCH_SCREEN_OFF_GESTURE_SETTINGS

Change-Id: I37c1236778eebcc2fa40297ab6b0b7a5eb7d34a5

Conflicts:
	res/values/candy_strings.xml
	src/com/android/settings/DisplaySettings.java

 Author:    Lars Greiss <kufikugel@googlemail.com>
Slim's System app remover

Change-Id: Ie71099cf4e8df4d1153d2e4da8df02d082a237a0

Conflicts:
	res/values/candy_strings.xml
	res/values/candy_arrays.xml
	res/xml/slim_interface_settings.xml

 Author:    fronti90 <m90braun@googlemail.com>
System app remover: add priv-app apps to list

* also added procedures for odexed ROMs and remove icons

PS2: added some DU copyright stuff and removed white spaces

Change-Id: I52b20f9c1e2bcb266f96e7938466eef1786a0fcb

Conflicts:
	res/xml/slim_interface_settings.xml

 Author:    ILWT <tsubus@lagat.org>