Add network stats to status bar [2/2] Thanks to AOKP and ChaOS

Change-Id: I19ae2f38ac2d815287c32862983ed38c6db0907d
Signed-off-by: STELIX <ssspinni@gmail.com>

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/sb_general_settings.xml
	src/com/carbon/fibers/fragments/sb/SbGeneralSettings.java
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18
Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

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

Fix

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>