Handle cancellation of the 'enabling PrivacyGuard' alert box.

I noticed that the option could remain ticked but not actually enabled
if the alert box is cancelled.

Change-Id: If9a4e88641a5e4283d6ea16c17ca4461841580e3
Fix derp.

Change-Id: I2766f4c89460c967e32349be008e38b3600b7e76
Settings: add reset option to clock color and cleanup (1/2)

to be consistent. So we have now on all places with colorpicker
same logic + option per menu to reset color to default.

as well some cleanup and codestyle corrections

cheers

Change-Id: If4156c57420a3a72b3eb0f01cf8441ccc7bf1eeb
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	res/values-ar/strings.xml
	res/values-cs/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fr/strings.xml
	res/values-it/strings.xml
	res/values-lt/strings.xml
	res/values-pl/strings.xml
	res/values-ru/strings.xml
	res/values-vi/strings.xml
	res/values/strings.xml