probably fix halo
Revert "Active display: Add options for date and am/pm [1/2]"

This reverts commit 1f1d8812d237c0494a21bf3f8bb365c7875441b6.
Revert "Correct active display settings naming"

This reverts commit 52b00cbf16da532992dc434571e81b20179abaaf.
Revert "Add active display to ChameleonOS [1/2]"

This reverts commit 46abc4b6731514370b7ede76c1005e6a670b1218.
Merge github.com:LiquidSmooth/android_frameworks_base into jb3
Add active display to ChameleonOS [1/2]

This is the ChameleonOS implementation of the active
display feature, similar to that found on the Moto X.

When enabled the screen will turn on and display the
incoming notification.  The user can then open the app
for the notification, dismiss the notification or unlock
their device normally.

Additional notifications, if any exist, will be displayed
below the ring notification and can be viewed by touching
the notification icon.  The user can simply slide their
finger across these other notification to quickly view
them.  The last one touched will remain in the ring and
the user can then perform any of the actions listed above.

PS2-PS12:
All the changes that brought us to this current implementation.

Change-Id: I51c17cec33b65dc60111a10c5ca2c449596ebe63

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/symbols.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
Correct active display settings naming

Change-Id: Ibfa2d41eed01d8987df52f013b111a0ce4e70739
Active display: Add options for date and am/pm [1/2]

Change-Id: Idc09772829cc6aa9bcfb064459fb3557c7b37f6b

Conflicts:
	packages/SystemUI/res/values/donottranslate.xml
fix derp
fix ActiveDisplay
Revert "probably fix halo"

This reverts commit ab2234fe36aa831bf11bc41cc1ecda92dc3f5179.
rework activation algorythm of ActiveDisplay [1/2] xD
rework activation algorythm [2/2] xD
Active display: Add sunlight mode. [1/2]

Change-Id: I541e74c5a1a7e6ce5028ab00cf998bba1d4fe0f9
Delay hiding systemui by 100ms
When disabling the keyguard, the systemui visibility is
changed and can occur after we hide it so delaying this
a bit resolves that issue.

Change-Id: Iad432f75195983837d643fa38495e6beb54f3e22
add little hint for further derps
Revert "Ported: Bluetooth Message Access Profile (MAP) from CM9"

This reverts commit 0e5fdcffdd1c3f1292a7cfa04660c966f70c883a.

MAP: Support MAP Server role on Bluedroid with javax.OBEX lib.

Handle No END OF BODY for MAP 1.0 Server Get request. Only the
last packet need send the 0x49(End of Body). For intermediate
packets, we need to send 0x48 (Body).

Move definitions for MAP or FTP Service Specific UUID and
Request type for CONNECTION_ACCESS_REQUEST intent to
BluetoothExt APK.

Change-Id: I04cfeb8d53b8f8c19160a2de1eb448a7ec1f2c41
CRs-fixed: 504042
Fix for Concurrency issue reported in  525529

List of services mainted by ActivityManager may get
updated/iterated concurrently if serviceTimeout() is
scheduled simultaneously with launch/stop of new services
for the same package.To fix the issue ,iteration of
proc.executingServices set in serviceTimeout() is synchronized
with same lock used by updating the set during
start/launch of service.

CRs-fixed: 525529

Change-Id: Ic230ad0d16e6ec64a20cf394aa1c1ce777c37a2b
services: Fix the bug in NFC shutdown logic

nfcOff should be checked for NFC shutdown instead of radioOff,
which is used for radio status.

Change-Id: Iafd620dc89ae8bed7855e313676527d4de32cb7c
base: App crash when select suggestion's length more than specified.

App crashed by catch IndexOutOfBoundsException which raised
by check span range when select suggested string.The root
cause is that the editor will truncate the suggested string
which length is more than it specified, but it also set span
use the suggestion's original length.

Update the suggestion's real length after editor replace the
original string to suggested.

Change-Id: I2d765701934a9e68be172cb87a104590f3cdeceb
CRs-Fixed: 532211