FW: Give user the option to use new Recents or Stock (1/2)

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I9929aa8e4845ac04aceb130241ea7af260fdb8db
[2/2] Add bluetooth triggers to profiles

Change-Id: I374cc93364c88b8b29c88345deccf297234ff624
Add 2G/3G option to profile connections (1/2)

Change-Id: I55d0768c9eeecb7dcce97c6d6390e339d678d0c4
QS Tile Background and Press Color (1/2)

Change-Id: Id2c8ddd7504f9e6d683dd317ad8e3072d30af69e

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Ringtones: Fix ANDROID_LOOP=true for ArgoNavis and Perseus ringtones

Add ANDROID_LOOP metatag to ArgoNavis and Perseus ringtones, removed in commit
https://github.com/CyanogenMod/android_frameworks_base/commit/5d7c089cabe599c3c5614c53f5a94c8c2357340f

Change-Id: I2fd05e73d68758867a17d2c3369cfeefc203ac5a
JIRA: CYAN-1434
Issue: https://jira.cyanogenmod.org/browse/CYAN-1434
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
FW: Bring back to original size
Frameworks: reduce SlimPie observer footprint (1/2)

time for code cleanup projects. Switch to same
logic we already use in QS/NT shortcuts. Use
only one string for the whole SlimPie config
This reduces massive the observer footprint.

cheers

Change-Id: I884c5d25c682e06d6649a16c2ba6d84460a3776f

Conflicts:
	core/java/android/provider/Settings.java
Profiles: Fix turning bluetooth on/off when its in intermediate state

Change-Id: I09213c987580f47a6c3618edb469edabda96230c
framework: Privacy Guard

 * Introduce a new privacy feature which allows the user to run an
   application with reduced visibility into his or her personal data.
 * Adds a per-application flag and simple API to determine if this flag
   is enabled for the current or calling process.
 * This flag can be used by content providers to decide if they should
   return a limited/empty dataset.

Change-Id: Id7c54d728e63acb2b02a2a9322930b54949f6c5d

Conflicts:
	core/java/android/app/ApplicationPackageManager.java
	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml
Add missing @hide annotations for Privacy Guard

Change-Id: I6072ed2d3ac05382f9cabbada0c42cea6cbe2422
Pink Halo Background for the ladies...
privacy guard: Use LocationBlacklist for location filtering

 * Google has built a per-package blacklist into the location service.
 * Let's use this to handle Privacy Guard instead of our one-off code
   which has a bunch of edge cases and can leave apps in a weird state.

Change-Id: I2f2ecd0b75ff51b44b1a6035189355d7bd63eaf4
Re-work and clean up the Halo style code
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

Conflicts:
	packages/SystemUI/res/drawable-hdpi/halo_bg.png

Change-Id: I3566b0438ee3cd48cd3e9a4650b6e90b5fabfedb
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 colorfilter function

Change-Id: If2081428b6e29ddb1e308ac57a0a866f9711d0e5
ListView Animations (1/2)

Credits to Team ThinkingBridge

Change-Id: I779a35402727ede46f969607ac33cf31dc53515f

multi users support

Change-Id: I08517d34181a0b8ec50bb3a2e9f121b71dad4f77

update and bug fix

Change-Id: I83f7a847912683c30ffe5674b4261658ca12e710

Conflicts:
	core/java/android/provider/Settings.java
AssetRedirectionManager: Accept redirections only for whitelisted resource types

Change-Id: Idf1ea739a81719b6a196f0114c9fc3b7c7ff428c