Merge pull request #6 from pcarenza/jb-mr1

update feature  in settings menu
HALO mass commit

-Custom colours
-Effect colours
-Circle, bubble and text colour
-Removed halo style

Thanks @daxxmax

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Add gesture based lockscreen security. [2/2]

PS2:
Tidy things up a bit.

Change-Id: I83e3ab643e19b2a2d9c8416f4925bbab05bbc896
Signed-off-by: iceandfire <arhamjamal@gmail.com>

Conflicts:
	src/com/android/settings/SecuritySettings.java
privacy guard: Fix crash when uninstalling an app

 * Don't try to update the privacy guard flag while refreshing after an
   uninstall since the PM will throw an exception at us.

Change-Id: Idadb99fefc2861e871f6206b08c844dda742fa68
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 a switch to hybrid settings

Thanks to @benjamingoodwin for the idea!

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Remove navigation bar height option

We already have this in RS

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Introducing LightUI

Settings part

Signed-off-by: iceandfire <arhamjamal@gmail.com>
HALO Size (2/2)
fixes  to HALO in Settings