Add HALO QS tile…

[1/2] [log]

Change-Id: I0db940cfc61da97d97b5113f8cd992a79a2f21bd

Conflicts:
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
Active display: Allow apps to be excluded from being displayed…

[1/2] [log]

This has been a highly requested feature so I guess it's about time
we implement it :).

Change-Id: I5c334833b78325733ae076c07afccebb02758ead

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
Halo: Add master switch to disable Halo (1/2)

Change-Id: Ifb0f4e8abdce1ed3d4cc4c973edc08794781db64

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Revert "Halo: Add master switch to disable Halo (1/2)"

This reverts commit 2e56ad41bdee183a7980f18e11c64481cf557c03.