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