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
Merge remote-tracking branch 'github/jellybean' into jellybean
Merge branch 'privacyguard' into jellybean
Merge remote-tracking branch 'github/jellybean' into jellybean
Merge remote-tracking branch 'github/jellybean' into jellybean
Merge remote-tracking branch 'github/jellybean' into jellybean
am: Fix the privacy guard notification

 * The privacy guard notification was not showing everytime. Fix the
   logic and handle it in the right place so it hits both the create and
   resume startup path.

Change-Id: I80c88ffb0fcb4ed3ea64ceb228bb436975278ecc

Conflicts:
	services/java/com/android/server/am/ActivityStack.java
Frameworks: privacy guard fix possible NPE

If the user flash a data app over recovery on clean flash
(like a lot themed apps or gapps packages are doing)
the user will get into a bootloop because of an NPE
due an unknown state of the user due that
installedUser == null

To fix it
Check if installUser exists if yes then
call the provider settings value for the current
user

PatchSet 2+3: message update
	      fix for real now

Change-Id: Ie5f94a0d0a11ae24fdfdc8372c0433b26793b66e
Merge remote-tracking branch 'github/jellybean' into jellybean
Merge remote-tracking branch 'pa/jellybean' into jellybean
Merge remote-tracking branch 'pa/jellybean' into jellybean
Enable Bare style PIE on protected lock screen
HALO Colors (2/2)

Implements RootBox's Halo colors feature. Merge work credit to @Ayysir.
Thanks to @BigBrother1984 for assistance as well.

Signed-off-by: Evan Anderson <evan1124@gmail.com>

HALO: Speech bubble color and text color

TODO: Now ditch Halo Style and bring colors instead.... Because, users had a colorful mind. So let's bring in a colorpicker instead...

HALO: Circle color

HALO : Ability to enable/disable custom colors

Why? Because, we all know some themers might theme the halo bg or also maybe the speech bubbles, so we trying not to mess with the alternate colors... ;)

Also, the drawable are being color filtered...

HALO : Effect colors

Add dependency for halo colors

This file was added by rootbox for pie colors a long time ago and it is needed for
halo colors.

Change-Id: Ib1c5bfc0f704fa852f43fd3243a4ec3120cb8da8
Signed-off-by: Evan Anderson <evan1124@gmail.com>

Missing imports

Change-Id: Id8b4ccd0ed60f13bc5dbb70f82263f4418d038d9
Signed-off-by: Evan Anderson <evan1124@gmail.com>

One more missing import

Change-Id: I404b27ae96b534551784dc3942fb7267469ebabb
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge branch 'hcolors' into jellybean
Merge remote-tracking branch 'pa/jellybean' into jellybean
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