Revert "halo: hide when no notifications option"

This reverts commit ef8befaf1b12719aec7bebd679df4a8e9fa4ce0e.

Conflicts:
	res/values/cm_arrays.xml

Change-Id: I2ce8d9a40d8e20e8dffada286708980304624b80
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/values/cm_strings.xml
	res/xml/halo_settings.xml
	src/com/android/settings/cyanogenmod/HaloSettings.java
Floating window (2/2)

Change-Id: Ibeadfd3ce2cac893c1a0ca75a236b1eeef1b5b71
fix

Change-Id: I47c516d1e3e0537e5f3a8309ba7310093c81ac15
another fix

Change-Id: I295b0d488013c562bf4ae07890e3d38a70249994
Settings: Moveable navbar (2/2)

New slim feature....phones can decide on the fly if they want
on landscape view a real landscape navbar.

navbar width settings are hidden now for tablet and large screen
new option also

some code cleanup

Patchset 2:
- standard value correction

Change-Id: Ie5535d8f92d0ab3590ace159a22c8ab813671e09
Merge branch 'Upstream/cm-10.2'