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_arrays.xml
Halo: Add master switch to disable Halo (2/2)

Change-Id: I78942ea1a31b7158172614b9f7baf2255b15db25
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
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
LCD Wizard dpi changer

Change-Id: I18f36f42b65e879504a0680d4f5a6f8a11556274

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_settings.xml
App sidebar [2/2]

- This implementation contains all the commits and chagnes of ChameleonOS until 18/07/2013

Change-Id: I899cf8487f0ec07bb93295dc099580c2e6d7f59a

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Add gesture based lockscreen security. [2/2]

PS2:
Tidy things up a bit.

Change-Id: I83e3ab643e19b2a2d9c8416f4925bbab05bbc896

Conflicts:

	src/com/android/settings/SecuritySettings.java