Add an option to allow a (subtle) notification vibration during calls.

Change-Id: I7dfbb64334e0e8e7f98d38bf503c053ff1880658
JIRA:CYAN-1550

Conflicts:
	res/values/cm_strings.xml
Add option to hide music controls in lockscreen.

Change-Id: I736df60139f1b977838c16136c0c30198633fcb2

Conflicts:
	res/values/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Revert "Add an option to allow a (subtle) notification vibration during calls."

This reverts commit debfdf229a9384006f2d3c64ad8bac096afe682e.
Show the "no action" summary for unitialized gesture values

Change-Id: I023ee587669103aa4d2a819af700ce3daa53695d

Conflicts:
	src/com/android/settings/inputmethod/StylusGestures.java