Fix adding lockscreen targets.

The empty targets were not included in the setting properly.
Also make the code a little more memory efficient.

Change-Id: I05cc7ce55ef5789f063033116ebfd9337e5ee28a
Remove debug leftovers.

Change-Id: I8d800829fe2f404810575d767cff864cf74cc80b
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	src/com/android/settings/cyanogenmod/ButtonSettings.java
Revert "disable not supported features on third party ime keyboards 2/2"

This reverts commit 8d6ba79cd20e17f94d64a75b0ff3e8a2400f5bea.