HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]

Change-Id: I7457c9598d55eb3b9c9baec7e1e9e239b68215ad

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Conflicts:
	res/values/cm_arrays.xml
	res/xml/halo_settings.xml
	src/com/android/settings/cyanogenmod/HaloSettings.java
ListView Animations (2/2)

Change-Id: Iab81c98d240d480fdb423e3a6c8af0f90a29c696

Conflicts:

	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java
Fix HALO dependencies
ùActive display: Option to change display timeout [2/2]

Change-Id: I2cb0252dac6563517f28123f5de0a40f4bb824bc

Conflicts:

	res/values/cm_arrays.xml

Conflicts:
	res/values/cm_strings.xml
	res/xml/active_display_settings.xml
Active display: allow hiding low priority notifications [2/2]

Change-Id: I244743ed1a32f59065af3c4507f4132b7d3b0d72

Conflicts:

	res/values/cm_strings.xml

Conflicts:
	res/values/cm_strings.xml
Fix Active Display brightness % overlapping text

Conflicts:
	res/values/cm_strings.xml

Change-Id: I180d3df5865e992ebda6721a63f14641e1264028
LastFixes

Change-Id: I0f802cc7a211df7dfea79e950dc4e12d936aaaf4
lastFixes_part2

Change-Id: I6a343195cb9424c15d26dbbae832ebf7a961cbe9