Hybrid toggle

Change-Id: I07d51c653c5d01fee2cba4100b35b9a09781eefd
Reuse string

Change-Id: I03829df23dcd1d31c0221b9b4880ba798165c981
Add back backlight curve adjustment.

PS2:Fixed ok string, moved AutoBrightnessCustomizeDialog.java out of CM folder
PS3:Fixed minor derp

Change-Id: I4f55091c5d8c72301c0985fa8463d198f86a7d21
Signed-off-by: kecinzer <kecinzer@gmail.com>

Conflicts:
	res/values-cs/strings.xml
	res/values/strings.xml

Conflicts:
	res/values/strings.xml
Spanish translations

Thanks to CM

Change-Id: I270ea3ea7e3d8df61e3a3d8eac65f10e18e7580a
Settings: Custom lock screen background [2/2]

Patch Set 1:    * port the custom lock screen feature from
                  ics (http://review.cyanogenmod.org/#/c/16914)

Patch Set 2:    * rename some strings
                * use constants instead of numbers
                * fix some code styling issues

Patch Set 3:    * code cleanup

Patch Set 4:    * rebased

Patch Set 5-6:  * code cleanup

Patch Set 7:    * fix comment location

Change-Id: I35e5c70fff423770a03b5bb39d439ebea82dd56a

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Bug #10 hide maximize widgets on tablets

Change-Id: I3b11b1b85fedfe3d2019d86413b72f4121689738
Bug #8 fix tile reorder

Change-Id: I7283c7095d94d54be524429a07be3b63ca8d8242
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into pa-cm-10.1

Conflicts:
	res/values/strings.xml
	src/com/android/settings/paranoid/Lockscreen.java

Change-Id: I4f4ddb01ed70fed1e6fb180ce1fdd781f4da2e7c