Quick launch shorcuts cleanup

Revert "Add Lightbulb NavRing target (2/2)"

This reverts commit 7c13c05c10e6a38547d0ff3fa49b849085c99161.

Revert "Quick launch shortcuts"

This reverts commit b2a6f69a330cd75d9630a827bf4d87a5d2f063f5.

Conflicts:
	res/values/simpleaosp_strings.xml
	res/xml/display_settings.xml
Custom Navring Targets (2/2)

All credits to CyanogenMod
This allows up to 3 custom navbar targets

Conflicts:
	AndroidManifest.xml
	res/values-sw600dp/dimens.xml
	res/values/pa_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Utils.java

Conflicts:
	AndroidManifest.xml
	res/values-sw600dp/dimens.xml
	res/xml/navbar_settings.xml
	src/com/android/settings/Utils.java
Add Lightbulb NavRing target (2/2)

Cedits:@TheMrcool212

Conflicts:
	res/values/ras_strings.xml

Conflicts:
	res/values/simpleaosp_strings.xml
	res/values/strings.xml

Conflicts:
	res/values/simpleaosp_strings.xml
	src/com/android/settings/cyanogenmod/NavRing.java
	src/com/android/settings/cyanogenmod/ShortcutPickHelper.java
NavBar shortcuts: Remove save button - everything is saved automatically anyway