Revert "Settings : Port lockscreen shortcut configuration (WIP)"

This reverts commit 01777c354f609dd5b482b72ca38aad02b741d27a.

Conflicts:

	res/layout/lockscreen_targets.xml
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/LockscreenTargets.java
Revert "Settings : Quick settings / Ribbons"

This reverts commit c0e70207f464b2b78953fe45e8e1fdb3a447fc47.

Conflicts:

	res/values/cm_strings.xml
Settings : Quick settings/Ribbons (Squashed commit)

Port forward settings for quicksettings/ribbons

Patchset 7: Point to more fitting drawables (blunden)

Change-Id: I2d4659337f48338547a4e6c1efb8b32122319fe3

Add back preference for drawer collapse behaviour

Change-Id: Ic6fa8531f9119447853e2dd3fa033924f0d37091

Conflicts:

	res/values/cm_strings.xml
	res/xml/settings_headers.xml

Patchset: 5
http://review.cyanogenmod.org/#/c/53887/
Settings : Port lockscreen shortcut configuration (WIP)

Port lockscreen configuration from cm-10.2

Change-Id: Ib4fd41f747912cc741eca1983c5f56df56176aad

Conflicts:

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

Patchset: 4
http://review.cyanogenmod.org/#/c/54067/