Settings: Volume key cursor control (2/2)

Change-Id: Ibc52b5d0c59558be9a24286ef6f1c6f049e117a3

Conflicts:
	res/values/cm_strings.xml
	res/xml/button_settings.xml
	src/com/android/settings/ButtonSettings.java