Complete settings rework
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/ose_strings.xml
	src/com/android/settings/ose/LockscreenSettings.java
Custom lockscreen wallpaper [2/2]

Based on commit of ParanoidAndroid on android 4.3

Lockscreen wallpaper: show error if cropping not supported

Custom wallpaper: use PNG

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
	src/com/android/settings/SecuritySettings.java

Conflicts:
	src/com/android/settings/ose/LockscreenInterface.java
Add icons for settings
Merge remote-tracking branch 'upstream/ose' into ose

Conflicts:
	res/xml/misc_tweaks.xml
	res/xml/ose_interface_settings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/ose/LockscreenInterface.java
	src/com/android/settings/ose/MiscTweaks.java