Add option to hide music controls in lockscreen
Signed-off-by: scotthartbti <scott@ubuntu.com>

Change-Id: Ifcee610041a846e6355a76016bafbb8e9b354cf5
Add an option to allow a (subtle) notification vibration during calls
Signed-off-by: scotthartbti <scott@ubuntu.com>

Change-Id: I7792ada6ff9e745eb8914c48e04429a9f277dec6
Settings: activate qs and notifications toggle for navring (2/2)

Change-Id: I967b247d6f0586715d1fd825b6872e5d3d2eb075
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	src/com/android/settings/cyanogenmod/NavRingTargets.java
Fix up lockscreen commit few changes back.
Signed-off-by: scotthartbti <scott@ubuntu.com>

Change-Id: Ic199cee9690d186a6d4104988e09706d053bb80b