Add gesture based lockscreen security. [2/2]

PS2:
Tidy things up a bit.

Change-Id: I83e3ab643e19b2a2d9c8416f4925bbab05bbc896

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SecuritySettings.java
HALO Size (2/2)

Change-Id: I630991372504b152af9dfa063c78c115c79d8c83
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1