fine control for menu & search button

Change-Id: I6b6b835925523341a567110ded4e6a54061f3bfe
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean

Conflicts:
	res/values/strings.xml

Change-Id: I953bbf8f393e73eaa3d6692845c1174ebbe24d91
merging fuck up

Change-Id: I0d57efad380e6ea070b31b28695385c2e6b57772
A couple of string adjustments

Please don't do:
* Including caps on a string (unless first letter)
* Undescriptive and confusing strings
* Calling a submenu item like parent (ex: "Pie menu button", is redundant if you're on "pie controls" category)
Merge branch 'jellybean' of ParanoidAndroid into WoH