Revert "put ActiveDisplay in the correct place"

This reverts commit b49a3e92d52704ae693ac65948b931b7039584f7.

Conflicts:
	res/xml/settings_headers.xml

Change-Id: I01e97e1919bdd427e2c8cb4a53aa09717da12615
Revert "remove old animatioms settings"

This reverts commit 9feb579539f6eab748e48fbd17a5cde406a08c6e.
Revert "[2/3]Settings: All in One Animation Control"

This reverts commit 55cc70f5f4e467adddc577144eec16205d3b4c00.
[1/3] Settings: Increasing Ringtone

      Option to set the incoming call ringtone volume to increase
      in pre-defined (user selected) increments.

Linked commits:
      Frameworks - https://gerrit.paranoidandroid.co/#/c/448/
      Telephony  - https://gerrit.paranoidandroid.co/#/c/451/

Change-Id: If7b36bd098dc65c8d418d372d4e0017868826a1f

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
home ~> launcher

Change-Id: I753ff9bef5e91203e413bb88c6537b912f04517b
Settings: Tie up loose ends

Change-Id: Id4e953f3e6212e625f447704535b90632881f6c6
[2/2] Settings: QH disable battery warning

Change-Id: Ica14963aa2ee77aa35da8ff7b8ea7b9d0de08505

Conflicts:
	res/values/custom_strings.xml
	res/xml/quiet_hours_settings.xml
	src/com/android/settings/slim/QuietHours.java
dual pane mode

originally ported from AOKP.. i think..

Change-Id: I9a20d85f0f62eadec1228a9fd81e64271ec90770

Conflicts:
	res/values/vanir_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java
option to disable camera sounds (1/3)

Change-Id: Ibc61515e78ecfa1d438b3770b02284c4cb9d7f23
Signed-off-by: sethyx <sethyx@gmail.com>

Conflicts:
	src/com/android/settings/SoundSettings.java
hide keyguard camera

originally from CM

Change-Id: Ief204c2c3a8f36b5f15737ec0de5043c56c4e643

Conflicts:
	res/values/vanir_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Don't mess with Active Display. Squashed: Reverts

Revert "[2/2] Settings: Lockscreen Notifications"

This reverts commit 50740821f5faf8994a388575c6c2c7855b5fc84c.

Conflicts:
	res/values/custom_strings.xml
	res/xml/security_settings_lockscreen.xml

Change-Id: If8ded729ec2317d6f9bd5087ac589ab947b33b99

Revert "[2/3] Settings: Remove Active display"

This reverts commit 6d2e5da7ca6e68d9d4981274f4ec4f4c185d8345.

Change-Id: Ica19afd6ce0a351d320bbe8faceaf46efb87d371

Conflicts:
	res/xml/security_settings_chooser.xml