Halo (2/2)

Change-Id: Ibe10027ee53172646d70386a00175299c4e56aae

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Halo size (2/2) - This commit complements this: 3f401366b68197d1c1a583c44aeb798d010de625

Change-Id: I668f454fb082ed7d43222a8d2dad0779c76bdc84

Conflicts:
	res/values/cm_strings.xml
Halo: Add master switch to disable Halo (2/2)

Change-Id: I78942ea1a31b7158172614b9f7baf2255b15db25

Conflicts:
	res/values/cm_strings.xml
HALO: Option to pause the underlying app (2/2)
- adds an option to pause the active app when using HALO
- this is enabled by default for devices with low memory
- (currently: <640MB RAM available to the kernel)

Change-Id: I3289bdcd0574ffe2c1cca63cc98fbfc10404b42e

Conflicts:
	res/values/cm_strings.xml
Floating window (2/2)
This is the setting part for the framework commit. This is a simple checkbox that allows the user to not make use of the floating window function seen in conjunction with PA's Halo feature. We are taking a different route on that Halo stuff and this is a very early start of it.

Change-Id: I7f7e4e98ba9a361a46a9b5a0e044f8ca0b85c0d3

Conflicts:
	res/values/cm_strings.xml
HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]

Change-Id: I7457c9598d55eb3b9c9baec7e1e9e239b68215ad

Conflicts:
	res/values/cm_arrays.xml
Add active display to ChameleonOS [2/2]

PS2:
Add pocket mode option, available if the device has
a proximity sensor.

PS3:
Add option to include ongoing and non-clearable notifications.

PS4:
Allow brightness control from 0% to 100%

PS5:
Refactor for release

Change-Id: Iae55640a31df68542c2af5d95097811b8fb1f66f

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
Active display: Add options for date and am/pm [2/2]

Change-Id: I6af47b2fd47e77398eee98cc6e30b8fcf1a44d45
Active display: allow hiding low priority notifications [2/2]

Change-Id: I244743ed1a32f59065af3c4507f4132b7d3b0d72

Conflicts:
	res/values/cm_strings.xml
Active display: Add sunlight mode. [2/2]

Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55

Conflicts:
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java
halo and ad: fixed

Change-Id: I2ff4207ffdc2ff6f301cde8bf810c61699dee75c