Merge branch 'kk4.4' of https://github.com/SlimRoms/packages_apps_Settings into kk4.4
Merge branch 'kk4.4' of https://github.com/SlimRoms/packages_apps_Settings into kk4.4

Conflicts:
	res/values/slim_arrays.xml

Change-Id: I8106cd9696101dbad6fa51eab5824b444d0ad44a
Merge branch 'temp' into kk4.4

Conflicts:
	res/values/sl_arrays.xml

Change-Id: Icdbbe2efbabbb439987b36790c3da0aa5c827a50
Pre-config

Change-Id: Ia170728a4fc5ae3cf5d26b49ffcf8f0e5ad54622
AOKP custom system animations (2/2)

ported fom here: http://gerrit.aokp.co/#/c/12305/

Thanks to Steve Spear

Change-Id: Ibd978f0516521579e5339f21ac81a360740358e8

Conflicts:
	res/values/cr_strings.xml
	res/xml/screen_and_animations.xml
Refactor and fix animation controls

Change-Id: I2be4988a3f4c62b6321a84321a1e99291438003e
Adjust

Change-Id: Ia4884ce879cc18a82dd4c0dac7beebafa8e69a52
Lockscreen blur and blur radious (2/2) + ChameleonOS SeekBarPreference.java

- Based on @BigBrother1984 implementation from this commit: 4e061d4b26b06499b3eddfaaf3564094851a4c2a

Change-Id: I11f3fa8ef477d08e4a9398099206f1a7ae3b6d8d

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

Conflicts:
	res/values/cr_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Fix up

Change-Id: I0aa40c454a3cd6a6ac8af4efc408958e87a95bb6
Second attempt at fixing Lockscreen blur

Change-Id: Ia7a7efc4f787e12cb2ee86d415321aaa10fcaffd
Complete Lockscreen blur

Change-Id: I56d0218fac74efa6549697639d103245c751a9ad