Settings: Slimrecents background color && transparency [1/2]
Allow user to specify background color and transparency level for the slimrecents panel.
PEEK (2/2)

- Toggle PEEK On/Off
- Make PEEK and LN working togheter as different options
- Put a explanation abaout how these 2 fatures work together

Based on (with some modifications): https://github.com/AOSPA/android_packages_apps_Settings/commit/db85f442ab46ac74011a63f4fb5adc5c3c01df4f
Thanks  to: @BigBrother1984

Change-Id: Ic5496765a3e4a72750588feaf7488415d8292337

Conflicts:
	res/values/cr_strings.xml
	res/xml/lockscreen_interface_settings.xml
	res/xml/lockscreen_notifications.xml

Conflicts:
	res/values/axxion_strings.xml
	res/xml/lockscreen_interface_settings.xml
PEEK: configurable pickup timeout (1/2)

- Allow the user to set different pickup timeout when a notification comes up through PEEK.
Options:
10 sec (default)
30 sec
45 sec
1 min
2 min

Change-Id: I82650f376b1dee81b5872317c70506d580361d49

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/lockscreen_notifications.xml
	src/com/android/settings/cyanogenmod/LockscreenNotifications.java

Conflicts:
	src/com/android/settings/axxion/LockscreenNotifications.java
PEEK pick up timeout: ensure stock value on clean install and also show summary of it (2/2)

Change-Id: I3dc9ae9ac683e11f6d23184aee4aebdd11a5de35

Conflicts:
	src/com/android/settings/axxion/LockscreenNotifications.java
Peek wake timeout (2/2)

- Originaly taken from AICP - Thath's why i'm keeping original autorship
- Allow user to set how long peek notification will hold screen on
- Minor changes by me @cristianomatos to match crDroid sources

Diff from original commit:
* Pass predefined values and made it as a list preference instead of seekbar
* Ensure summary and default value in clean installations
* Made multi user

Original commit: https://github.com/AICP/packages_apps_Settings/commit/36674cc224958c1a64caecc605ea8ffd44ff897d

Change-Id: I84e8120b50841f0d9e61d77739d6e4b3427ac091

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/lockscreen_notifications.xml
[2/2] Add support for Peek app

Disable built in peek when Peek app is installed. Enable it again on app's unistall.

Change-Id: Icabb32c8322642eca81bccea7e053200a74a9b2b
Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenNotifications.java

Conflicts:
	src/com/android/settings/axxion/LockscreenNotifications.java
AOKP custom system animations (2/2)

ported fom here: http://gerrit.aokp.co/#/c/12305/

Thanks to Steve Spear

Change-Id: Ic692025b0db02dd01684b4e9f91d63a04f80181f

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml
	src/com/android/settings/SettingsPreferenceFragment.java

Conflicts:
	AndroidManifest.xml
	res/values-ko/cm_strings.xml
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java
ListView Animations (2/2)

Credits to Team ThinkingBridge

Change-Id: I9be8e321d4a47b6718cd461893365591793c15d5

Conflicts:
	res/values-ko/cm_strings.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Conflicts:
	res/values/cm_arrays.xml
Update AOKP custom system animations (2/2)

Credits to Stevespear426

Change-Id: Id20e940724a3fb52339aecf52c5aaff129c71faa

Conflicts:
	res/xml/display_settings.xml

Conflicts:
	res/values/cm_arrays.xml
Add Axxion Logo to about phone

Conflicts:
	res/xml/device_info_settings.xml
Enhance Axxion logo
Settings: Reorganize

Thanks to @codex-corp for the drawables

Conflicts:
	res/drawable-hdpi/ic_axxion_progressbar.png
	res/drawable-xhdpi/ic_axxion_progressbar.png
	res/xml/notification_drawer.xml
	res/xml/system_ui_settings.xml
Option to enable LED screen on from AOKP [2/2]

Conflicts:
	res/values/axxion_strings.xml
Apps: Add blacklist interface [2/2]
Now with 100% more hidden checkboxes

@cristianomatos: Include Halo in new blacklist button and some code adjustment and clean-up related

Change-Id: I8894e00a81ed84583b7bf0be8795c25c857161af
Signed-off-by: Evan Anderson <evan@thelinuxman.us>

Conflicts:
	res/values/axxion_strings.xml
	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:
	res/values/axxion_strings.xml
	src/com/android/settings/applications/InstalledAppDetails.java
SlimPIE Removal

Revert "Some fixes"

This reverts commit a9318926615870502b4728e0f8d0e56446fcc42f.

Conflicts:
	res/values/axxion_strings.xml

Revert "Settings: SlimPie give user ability to reduce trigger heights if IME keyboard shows (2/2)"

This reverts commit 3b26e14f8e5481f29b0b5cd47c6629ae7caddad4.

Revert "Settings: SlimPie (2/2)"

This reverts commit b9ea23ce71e2a7696c5e8f02e1ef6a0a17875001.

Conflicts:
	res/layout/buttons_list_view_main.xml
	res/values/axxion_arrays.xml
	res/values/axxion_strings.xml
	res/xml/system_ui_settings.xml

Revert "add dslv controller"

This reverts commit 7fef67ae1169fd596e22910aef97e92a466c413a.

Conflicts:
	res/values/axxion_attrs.xml

Conflicts:
	res/values/axxion_attrs.xml
	res/values/axxion_strings.xml
[WIP] SlimPIE (2/2)

Ported from CM sources by @cristianomatos

Change-Id: I10e026e76748b1e273d38a983ea873a7076b124d

Conflicts:
	proguard.flags
	res/values/cr_attrs.xml
	res/values/cr_strings.xml
	src/com/android/settings/axxion/SeekBarPreference.java

Conflicts:
	res/values/axxion_attrs.xml
	src/com/android/settings/axxion/SeekBarPreference.java
Settings: Handle navbar heights correct on dpi changes + more (2/2)
Till now we set the height in px in the settings. Which is a problem
especially on multiDPI roms like we are when the user afterwards changes
the dpi due that it isn't calculated correct anymore on the new dpi.

This commit does
- save the dp value in provider and calculate the real px in fb
- clean up the settings stuff for it + do it a bit nicer (only settings part
  where we do not set the value for the listview)
- add Converter class for common methods we always use....till now only px->dp
  and dp->px method

Change-Id: Icf9754ee496ae3cc6d998f58a1dc543d0a7383ee

Conflicts:
	res/values/axxion_dimens.xml
	src/com/android/settings/axxion/NavbarDimenSettings.java
Toggle Navbar through power menu
Credit to Slim and Cristianomatos
Conflicts:
	src/com/android/settings/cyanogenmod/PowerMenu.java
Settings: Volume panel background color && transparency [1/2]
Allow user to specify background color and transparency level
    for volume panel.

Conflicts:
	res/values/axxion_strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java
HeadsUp: option to launch in floating window (2/2)