Settings: Gesture Lockscreen (2/2)

Changes needed for lollipop

Change-Id: Icf2f5a5cd3474ea325097437bc2956c10e2ae9d7

@alviteri: crDroid'fy

Conflicts:
	res/values/candy_integers.xml
	res/values/candy_strings.xml