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
Network speed

Change-Id: Ib120d424b3b86b83bb58383c458d1746d865b371
Compiling fixes

Change-Id: I7666fadff193f8e1c91baf6518b90f48c4a657d8