Fixes

Change-Id: Ifbec7c6265a19b2151a2cf29a5d3aa1cfc33d39c
Signed-off-by: OwnDroid <askowndroid@gmail.com>
Revert "Frameworks: add ability to send a custom intent after keyguard is finished"

This reverts commit 0a47dbea09e76f3a83a39347942f1fe71924089a.
Revert "Revert "Revert "Frameworks: Keyguard - Add user configurable shortcuts"""

This reverts commit 34a4e6ddc3adafd72bb8119e0a31081fc02e8245.

Signed-off-by: OwnDroid <askowndroid@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I64c6ae3974db1ac94a5e025e3652c0bc0f06853e