Dont enable Wi-Fi if it's not toggleable in flight mode

Dont enable Wi-Fi if it's not toggleable in flight mode
by restoring the return which was removed by
e78c1879058571c00879f0d3e756951302adf513

Change-Id: I8ca5a3e9b3f36f148f08ce97b8a2b854bf7de21c
Handle cancellation of the 'enabling PrivacyGuard' alert box.

I noticed that the option could remain ticked but not actually enabled
if the alert box is cancelled.

Change-Id: If9a4e88641a5e4283d6ea16c17ca4461841580e3
Fix derp.

Change-Id: I2766f4c89460c967e32349be008e38b3600b7e76
Add gesture based lockscreen security. [2/2]

PS2:
Tidy things up a bit.

Change-Id: I83e3ab643e19b2a2d9c8416f4925bbab05bbc896

Conflicts:
	src/com/android/settings/SecuritySettings.java