[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

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

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

Change-Id: Ia1b92205a5db5bc50bc7633d129509d5231a556b

Conflicts:
	res/xml/lockscreen_interface_settings.xml
Fix navbar dimens and lisardroid settings

Change-Id: If81a184e419ab3e66b3b4f2dc837e6edb20d6cd9
Settings NavbarDimens 2/2 && Translate-ES

Change-Id: If7e70b891ba8269fc171b184f20e91207d392e0b

Conflicts:
	res/values/ls_arrays.xml
	res/values/ls_strings.xml
[1/2] Settings: HALO @cristianosmatos thansk

Forward port from jb43.

Change-Id: Iad1b9dfe120529bde60039781d5383e75f46fe17

Conflicts:
	res/values/ls_arrays.xml
	res/values/ls_strings.xml
	res/xml/settings_headers.xml
Active display [squashed] (2/2)

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
FULL ActiveDisplay Settings

Pac : Pimp up ActiveDisplay
f7a3e64fa3 Browse code
Der-Schubi authored

OmniGears: Fix pimp up ActiveDisplay …
9852cc52b6 Browse code
micku7zu authored

Change-Id: I51b2943829564910a3955d7f56fa7f872741e637
fix last commit

Change-Id: I651ed5adf1ecfa44fc47ac1d109c8451df9bb7a4
Fix active

Change-Id: I0d2d3b5f15a4aebb333da55ffedaea8c4e5baa08

Conflicts:
	res/xml/lisardroid_settings.xml
fix

Change-Id: Icf7932a683305a1fc2ffa87f9fb36568ce6f42cf
[2/3]TeloRadio packages_apps_Settings
	* Lista de configuracion
		> Enable manager
		> Use LTE
		> 2G with Wi-Fi
		> 2G with screen off
		> 3G to unlock

Conflicts:
	AndroidManifest.xml
	res/values-es/tk_strings.xml
	res/values/ls_arrays.xml
	res/values/ls_strings.xml

Change-Id: Ie67f3ec4969c4578147b396f6e7e2370c8664fb1