[2/2] Settings: Add lockscreen ring battery setting
Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Modified by temasek to cm style

Conflicts:

	src/com/android/settings/cyanogenmod/LockscreenInterface.java

Conflicts:
	res/values/cr_strings.xml
Settings: statusbar clock customization + initial interface + color picker

- added slims clock and date customizations for status bar
- added our own modded marginov color picker which we use as default
- added initial interface settings. A bit empty currently but we are on
  alpha and it will be filled fast for sure. Added as well two empty classes
  due that we need them later

Change-Id: I48b8487a40d07c07f6feba91a55af93bb82d80d9

Conflicts:
	res/xml/settings_headers.xml
Move battery around lockring to security settings

Conflicts:
	res/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java

Change-Id: Ia1b92205a5db5bc50bc7633d129509d5231a556b
Fix last commit

Change-Id: I2be84d8a4f82582e5a48de100f1c22bcc49b50dc