Merge CM

Conflicts:
	src/com/android/settings/cyanogenmod/ButtonSettings.java
Fixes
[SQUASHED] Lockscreen Notifications (2/2)

Following commits inside (with minor adaptations)
https://github.com/AOSPAL/android_packages_apps_Settings/commit/10ccffd1ca698aa204479d1c935a3ce3fa47edb2
https://github.com/AOSPAL/android_packages_apps_Settings/commit/17c7bcf21b56a8d977b26f62921d58a3db024a98
https://github.com/AOSPAL/android_packages_apps_Settings/commit/db6757742959c983d2a3477c217fe68e870a6969
https://github.com/AOSPAL/android_packages_apps_Settings/commit/8fc910a7d0a3d559b125706ddf4b65b71bada6c1
https://github.com/AOSPAL/android_packages_apps_Settings/commit/a73649abfce893d99ddc902a04d495970c0f117f
https://github.com/AOSPAL/android_packages_apps_Settings/commit/9b8a305b968018ab4b26fd35720a1e98ccd3852c
https://github.com/AOSPAL/android_packages_apps_Settings/commit/cb18eca4bf63833428b4487c54b1bc3b1b96f66b
https://github.com/AOSPAL/android_packages_apps_Settings/commit/b2ff326f86c6641486dc92de9e02c36a727f5040

Change-Id: Ib13c39cb67839bec92a660000eae23bdb7fdfa30

Conflicts:
	res/values/cr_dimens.xml

Conflicts:
	res/values/cr_strings.xml
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
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/axxion_arrays.xml
	res/values/cr_strings.xml
PEEK pick up timeout: ensure stock value on clean install and also show summary of it (2/2)

Change-Id: I3dc9ae9ac683e11f6d23184aee4aebdd11a5de35
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_strings.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>