add settings for clock styles

Change-Id: Ib418213f71bcfefc32cb57abe6148276f8b25851

Conflicts:

	res/values/strings.xml
	res/xml/system_settings.xml