Revert "FULL ActiveDisplay Settings"

This reverts commit 01a4f5bf765dab77abba1ab8bb6eb1537792530e.

Conflicts:
	res/values/axxion_arrays.xml
Revert "Active display [squashed] (2/2)"

This reverts commit 79f042809107982091a4bc25f682361837b88022.

Signed-off-by: siracuervo <fl.siracusa@outlook.com.ar>

Conflicts:
	res/values/axxion_arrays.xml
	res/values/axxion_strings.xml
	src/com/android/settings/axxion/AppMultiSelectListPreference.java
[1/2] Settings: HALO COLORS!

Add custom color.
 LOTS OF THANKS TO THE AUTOS, ALL THE CREDITS TO HIM
Change-Id: Idea298c6c89b7dc3836527451f6aba6a338c62eb
Signed-off-by: siracuervo <fl.siracusa@outlook.com.ar>

Conflicts:
	res/layout/dialog_color_picker.xml
	res/values/colors.xml
	res/values/pa_strings.xml
	src/com/android/settings/axxion/Halo.java
[2/2] Settings: Option to enable Notification Light when screen is on
This makes it possible to let the Notification LED flash even when the screen is on

Change-Id: If7209d62918a1ddf5701986809a22c3cccc14263

Conflicts:
	res/values/cr_strings.xml

Signed-off-by: siracuervo <fl.siracusa@outlook.com.ar>

Conflicts:
	res/values/axxion_strings.xml
Revert "Settings: Lockscreen custom wallpaper (2/2)"

This reverts commit 3538a6691bdda46b436f1185c86e1bfb1af2c753.

Conflicts:
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Fix colorpicker
Fix build and delete unnecessary colorpicker stuff
Revert "Buttons: Prevent toggling disable hardware keys too quickly"

This reverts commit 337f537a41344bb310460ff64cf1154a9c5b4623.

Signed-off-by: siracuervo <fl.siracusa@outlook.com.ar>
Revert "Buttons: Allow disabling hard navigation keys"

This reverts commit fa000453dce8936ee6805c8d953f3ab8d42f2b21.

Conflicts:
	res/values/cm_strings.xml
Fix that file because of the active display revert
Add SeekBarPreference.java
Add xml complement for seekbarpreference
Replace cm seekbar by ChameleonOS seekbar

Change-Id: Icbee9d46c3c60094fdcce774d617b43b02ea041b
Signed-off-by: siracuervo <fl.siracusa@outlook.com.ar>

Conflicts:
	res/layout/seek_bar_preference.xml