Note to self: Don't forget important imports :I
Add back notification light settings.

Change-Id: I474a14a1b395407f5ca273a5d6a3a7f03f7e4698

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	src/com/android/settings/DisplaySettings.java
Navigation bar custom height

Conflicts:
	res/values/ras_arrays.xml
	res/values/ras_strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/values/simpleaosp_strings.xml
Settings: Add Utility function

Conflicts:
	src/com/android/settings/Utils.java
Settings: Integrate Voice+ into Settings (1/2)

Change-Id: I4778443c219cd29a463e9c4dab60783dca251f0f
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	res/values/simpleaosp_strings.xml
Settings: Remove V+ pref if V+ isn't present

Change-Id: Ia202d00ebee95e99018e7b04ef284de0bf3f1e1c
Quick launch shortcuts

Conflicts:
	res/values/ras_strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/values/simpleaosp_strings.xml
volume rocker: option to control cursor in text field using volume keys

Conflicts:
	res/values/ras_arrays.xml
	res/values/ras_strings.xml
	res/xml/system_settings.xml
volume rocker wake
volume rocker music control

Conflicts:
	res/values/ras_strings.xml
	src/com/android/settings/simpleaosp/VolumeRocker.java
[2/2] Settings: Optional statusbar battery icons

    * Circle battery and circle battery percent (from CM <Sven Dawitz>)
    * Battery bar percent from Google
    * Quicksetting battery tile reflects status icon (from SlimROM <kufikugel>)

    - Option appears under Settings -> Battery -> Status Icon (ActionBar)

Part 1: frameworks_base

Patch set 1: clean white spaces
Patch set 2: fix conflicts

Signed-off-by: Anu6is <curtis.mayers@gmail.com>

Change-Id: Iae497e495045ca68522ab0b5bd342e044d4000f3

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
Settings: Battery Options

Until we find a suitable solution for displaying the text percentage
on the battery bar, hide the option.

Change-Id: I07cc98d3ee32c037c9dcf1f8b2ecb368c96aab47
[2/2] Settings: Battery Icons

      Reveal hidden battery option

Change-Id: I256a7e52e40b9e581bd85cb5996070f0488d95a6
Add Lightbulb NavRing target (2/2)

Cedits:@TheMrcool212

Conflicts:
	res/values/ras_strings.xml

Conflicts:
	res/values/simpleaosp_strings.xml
	res/values/strings.xml
kill app long press back

Conflicts:
	res/values/ras_strings.xml

Conflicts:
	res/values/simpleaosp_strings.xml

Conflicts:
	res/values/simpleaosp_strings.xml
Moving Volumerocker to display settings
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
Settings : Port lockscreen shortcut configuration

Port lockscreen configuration from cm-10.2

Change-Id: Ib4fd41f747912cc741eca1983c5f56df56176aad

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	res/xml/lockscreen_widgets.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
	src/com/android/settings/cyanogenmod/ShortcutPickHelper.java

Conflicts:
	AndroidManifest.xml
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	res/xml/lockscreen_settings.xml

Conflicts:
	AndroidManifest.xml
	res/values-de/pa_strings.xml
	res/values/pa_strings.xml
	res/xml/lockscreen_settings.xml