initial commit
Merge branch 'kk' of github.com:CPA-Poke/Carbon_packages_apps_Settings into kk
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml

Conflicts:

	res/values/gummy_strings.xml
	src/com/android/settings/SecuritySettings.java
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: I461125b7e2e05b2d1e274745ea8fbca4d366182d

Conflicts:
	res/values/gummy_arrays.xml
	res/values/slim_strings.xml
	res/xml/settings_headers.xml

Conflicts:

	AndroidManifest.xml
	res/values/gummy_arrays.xml
	res/values/gummy_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Utils.java
Settings: Port all carrier label options (2/2)

Conflicts:

	AndroidManifest.xml
	res/values/gummy_strings.xml
settings: add Battery Styles the new way 2/2

google draws now the battery icon which fits perfectly into our
concept. Beside that the batteryview is as well used on QS.
So we readd our battery icons (icon, percentage, icon with percentage
circle, circle perc, dot circle, dot circle perc) back and all are
drawn. As well the icon does not only change on statusbar as well
on QS it is reflected.
As usual color options are present for the User to style the icon

Change-Id: Iaedede55e14d99f79e560e74188692c894f2d961

Conflicts:

	res/values/gummy_arrays.xml
	res/values/gummy_strings.xml
	res/xml/status_bar_settings.xml
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml

Conflicts:

	src/com/android/settings/SecuritySettings.java
Lockscreen Interface inital push
moved widget prefs from Security Settings into new LockscreenInterface class

Conflicts:

	AndroidManifest.xml
	res/values/gummy_strings.xml
	res/xml/gummy_interface_settings.xml
	res/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java