Enable Halo pressed image in expanded status bar
CM Camera Tile (1/2)

Adds CM's live camera tile feature to AOSPA.

QuickSettings: Camera tile

Change-Id: Id0beb3dd559536bb5571ddc87cb0bcb4945b1a77

Conflicts:
	core/java/com/android/internal/util/cm/QSConstants.java
	core/java/com/android/internal/util/cm/QSUtils.java
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

Fix merge mistake

Change-Id: I8b23d408f64041772f38b62e1ee979126566fea6
Prevent notification acces via HALO on protected lockscreens
Don't show pinned Halo))) apps on PIE (hide count, icons and text)
Merge pull request #32 from manumanfred/jellybean

Enable Halo pressed image in expanded status bar
Merge pull request #43 from Anu6is/jellybean

Prevent notification acces via HALO on protected lockscreens
Settings Provider: Indentation fix

Change-Id: I14aef0e0c105f9917c03e0fe3c15b2e239526170
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge remote-tracking branch 'pa/jellybean' into jellybean
Merge branch 'exp' into jellybean