More string edits
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
More string edits
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
Rearrange lockscreen section
Show application's package name in the "App info" screen.

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

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18
Merge branch 'kk' of https://github.com/SimpleAOSP/android_packages_apps_Settings into kk
Add some keys
[2/2] SystemUI: Network speed indicator
[2/2] Settings: Update network traffic indicator

*Update settings option to cycle through display modes Off->bit/s->Bytes/s

*Minor formatting changes

Change-Id: I9add610a8d14f5a48f2af0a82ced0c186224e282

Conflicts:

	res/values/custom_strings.xml
	src/org/omnirom/omnigears/interfacesettings/BarsSettings.java

Conflicts:
	res/values/mahdi_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/mahdi/StatusBar.java
[2/2] Settings: Upgrade network traffic meter

*Updated class name to be less ambiguous
*Replaced the multi-check in settings with a proper listview
*Added the ability to view up-stream, down-stream or both
*Added the option to change how often it refreshes
*Added a check before it updates the status bar to prevent it from
refreshing everything needlessly
*Added icons to show data direction
*Remove unused style attributes

Icon artwork is courtesy android design downloads
Some features were inspired by previous work done by 0xD34D

Conflicts:
	res/values/mahdi_arrays.xml
	res/values/mahdi_attrs.xml
	res/values/mahdi_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/mahdi/StatusBar.java
Another ocd commit
Fix:lockscreen ring battery
Add Summary for Hover
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk

Conflicts:
	src/com/android/settings/simpleaosp/LockscreenSettings.java
Hover Master Switch

Thanks to @maniac103
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk

Conflicts:
	res/values/simpleaosp_strings.xml
	src/com/android/settings/simpleaosp/LockscreenSettings.java