Squashed settings part of Traffic Meter

Change-Id: Ic38acc44c915897e28e77a7f68a63ea365f8cd74

Conflicts:
	AndroidManifest.xml

Conflicts:
	AndroidManifest.xml
	res/values/ck_arrays.xml
	res/values/ck_strings.xml
	res/xml/cyankang_settings.xml
	src/com/android/settings/slim/InterfaceSettings.java

Conflicts:

	AndroidManifest.xml
	res/values/slim_strings.xml
	src/com/android/settings/slim/InterfaceSettings.java
color test

Change-Id: Ide6b10017bef3192e01b0cdab8e0e99ce634f3a7
Add network usage stats to status bar [2/2]

Change-Id: I1858c5265c48b936c831cc9eb2d267f6d28aec28

Conflicts:
	res/values/ck_arrays.xml
	res/values/ck_strings.xml
	res/xml/statusbar_net_speed.xml
	src/com/android/settings/slim/StatusBarNetSpeed.java

Conflicts:
	res/values/slim_arrays.xml

Conflicts:

	res/values/slim_strings.xml
fix

Change-Id: I0cc3655b267461579cc33789b89925f030a71e37

Conflicts:

	AndroidManifest.xml
test color

Change-Id: I91321eec91b6a4487d69b3c805ef518f8e26f977
Fix NetworkStats

Change-Id: I5abdb4ce8d1b2a6470d61dfe12e8673087346a0c
Fix2

Change-Id: I37f56fd3357a059c7a99f318fe997234c6ae9221
[2/2] Settings: Battery Bar

Port of https://github.com/AOKP/packages_apps_ROMControl/commit/4d23fe17046512f5d9841bd79cb1bc83480e73b0

Change-Id: If3377e2836e4f37fcb7d71a5d4f8d5f8a6f857dd

Conflicts:
	res/values/ok_arrays.xml
	res/values/ok_strings.xml
	res/xml/omnikang_settings.xml

Conflicts:
	res/values/slim_strings.xml

Conflicts:

	res/values-es/slim_strings.xml
	res/values/slim_arrays.xml
Battery fixes

Change-Id: I571a8b43ef15100acb29719db15a6cbe7118daa3
Deleted unused import

Change-Id: Ic431ff05346b486be01d66115ab3f4d71a53848e