Enable Halo pressed image in expanded status bar
Brightness Control on Status Bar (1/2)

Added Support to control the current brightness to the Status Bar.
Revert "Brightness Control on Status Bar (1/2)"

This reverts commit e4047aa4129cfd5f74be4eb6f76fa3dc2105712c.
CM Privacy Guard (1/2)

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/provider/Settings.java
	core/res/res/values/cm_strings.xml
	core/res/res/values/symbols.xml

Add missing @hide annotations for Privacy Guard

Change-Id: I6072ed2d3ac05382f9cabbada0c42cea6cbe2422

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
Stylus gestures features (1/2)

Forward-port of https://github.com/CyanogenMod/android_frameworks_base/commit/9f3ee9f7c0877fcfbe90a7c176481f949194fb75
to JB

Change-Id: I9c8a03dce226d2463659846ff3a12435efdf5c1d

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
Fix build with java 7

Change-Id: I48b2048a0cc82df0007ca897aaa8e369bf2d8723
Halo: unregister settings obeservers

Change-Id: I57ec9b874c332bec8be2b3e3ed2505f6be53b79e
gps: Add support for Qualcomm GPS hardware

 * This ABI is changed, but we aren't using the new features in MR1.
 * Add a little translation for the changed fields and methods.

Change-Id: Ieecc2235b42f64fc69d4651855f4e9edfe7d738d
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
Fix battery icon color

Change-Id: I1fd797806b422a530ef25d8685c80bc0875fffd1
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_frameworks_base into jellybean-legacy
Camera: add support for cm camera

camera: Add support for sending raw commands

 * Certain camera drivers need magic commands to select special modes
   such as ZSL or HDR. Add support for sending raw commands from
   applications.

Change-Id: I512a765c7a67ffd2877e465cf6493ffc2b3b54ac

Camera: add ISO mode support

Change-Id: Ied2075f950269990d836fc768b2c6c36088d494f

Camera: add additional ISO modes (2/2)

Change-Id: I3460c3de4cbef467430673146a9ddb2fdc8f5032

Camera : Powerkey shutter (1/2)

Allows user to take use power key to take pictures/videos

Change-Id: I85a1e1761199f4604672be42a3a5005227f5451a
Revert "Fix build with java 7"

This reverts commit c430247fc2ab4a17ceee929b2b3502a3460e418e.
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean-legacy
Merge clean up

Get rid of duplicate flag and fix some spacing

Change-Id: Ibe92af1cfd5d1622d86c1d2c8464e6ac684e9d91
Merge pull request #37 from linuxman94/privacyguard

CM Privacy Guard (1/2)
Add SMS Middleware layer.

Add fix so ordered broadcasts are delivered to system
apps first in the event of a tie. This works around
the issue where terrible apps steal SMS notifications
from the broadcast queue to simply prevent notifications
that could otherwise be removed by a toggle.

Change-Id: I4fff0c584f8fce9c5f2f4fe86a82fe6480c307c7

Conflicts:
	core/res/res/values/cm_strings.xml
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
Revert removing FLAG_ACTIVITY_CLEAR_TOP from intent
Removing that flag from the intent provokes some apps not being able to finish pressing the back key.
This change doesn't affect other opened apps.

Change-Id: I81a47f8e648114d8e2144a3b9854ede299d67871
HALO: show halo button in pie

Change-Id: I858ec08837559f4b2806df0ac68b8a703189b1db