Cleanup button wake settings (1/2)

Change-Id: I972251384eee15cf9e4915cd82d189ed7ef3050d
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/config.xml
	res/xml/button_settings.xml
	src/com/android/settings/Utils.java
missing strings needed for gesture lockscreen

Change-Id: I21ee7002ca9b11a605d2d3882f70344b2051d6ff
Signed-off-by: scott <scott@ubuntu>
couple minor changes for app circle bar pick from earlier

Change-Id: Id3ea8aa385c4ebd6f3d6b5ef2846fde2cc87073e
Signed-off-by: scott <scott@ubuntu>