Destroyed not app killed :D

Change-Id: I13bcc77902c1ae139ae1940fec4f7a8ea5064502
SystemUI: add Weather display to status bar header

Change-Id: Ic2fea861c36f405d8a0e64cc9224f47088ac6351
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: Forward Port Volume Long Press Skip Tracks (1/2)

Bring Forward Volume Rocker Track Change

Requires Settings Change
http://review.cyanogenmod.org/#/c/82222/

Change-Id: I70b00e08fe48707110725dd1daa56b1e48d15a03
National roaming info for yesss! in Austria

Change-Id: I0f8eaf3e83df4886fa24a9af95087a20ebb10a3f
Merge remote-tracking branch 'cm/cm-12.0' into HEAD
frameworks: fix make updateapi for weather setting

Change-Id: I3a23cd432138e63e037b427ceaf62a87627dfde6
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge branch 'cm' into HEAD
Forward port Samsung STK support (frameworks/base)

[pawitp: port to Lollipop]

Change-Id: I08d169bc466df290fca838b09f6b0fbea2ac82a8
Feature : Volume adjust sound preference 1/2

This patch allows the users to choose if they want the audible tone when adjusting the volume

The new preference is in
Settings | Sound
    Volume adjust sound
        Play sound when adjusting volume with hard keys
The Checkbox is defaulted to ON (1 in defaults.xml)

Look for 2/2 for the Settings, Sound Panel Change

[mikeioannina]: Update for L

Change-Id: I705c23065706317760ba60efc1a71f3ba6082bbd
Forward port battery icon options [1/2]

Bring forward the various battery icon options.
Portrait, Landscape, Circle, Text.

Still retains new options for where to display battery percentage text.

Change-Id: Icfc14d989eebde9014538291c24aa76d328df234
SystemUI: Update WiFi indicator drawable sizes

Resize both the activity arrows and the signal strength indicators so
that both are properly centered and overlay correctly for all screen
densities.

Change-Id: I7e95adcdc110995504534a58eb0df42ba132bc97
Merge branch 'cm' into HEAD

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	core/res/res/values/config.xml

Change-Id: I10c900516e728150bab3fbc13f8c0dc6000159b3
Merge branch 'cm' into HEAD
Bluetooth-Wipower: Enable dynamic logging for A4WP

This helps to enable wipower dynamic parameters intercepted
at host to be logged via adb/command line.

Change-Id: Ibd79f4d56c99a43eab1146f4ae20155ac439cd8f
CRs=fixed: 754356
Bluetooth: Adds check to verify Bluetooth adapter state

This checks whether bluetooth is turned ON or not in BLE
start scan process.BLE scan apis are called from applications
so need to check if BT adapter state is ON to avoid Bluetooth
crash

CRs-fixed: 649274
Change-Id: Ic075e1560bba2cabbfac2e1477932f9ad3144067
Bluetooth: Change userhandle to current from ALL

Change to a user handle to indicate the current
user of the device instead of ALL to avoid the
force close error in bluetooth.

Change-Id: I72e5feba6616a48ef8590b6965ec1d94f27b7dca
CRs-fixed: 742926
Bluetooth: Enforce BT state check during GATT close/disconnect

Enforce BT state check when BLE Apps call into GATT to handle scenarios in which
delayed call from BLE App to disconnect/close comes after the BT is OFF

CRs-Fixed: 759852
Change-Id: Iaf7004cdd4fe52e64c48838f6ed918e1d25f5a1e
Bluetooth: Sync Bluetooth Adapter and Manager Service.

BluetoothAdapter has timeout of 8 sec whereas waittime of
Bluetooth Manager Service has timeout of 3 seconds, case
if remote does not responds to service level  disconnection
then Mangaer Service times out after 3 sec.
During multiuser switch new process is created hence
previous process cannot block ON thus one process is waiting
for timout and other process tries to Turn BT ON leading to
crash.
Fix involve is to have Adapter and Manager service
have same timeout during user switch.

CRs-Fixed: 761698

Change-Id: Ib1590fb2a41f748f36c58ae9ca8916cf68befc82
Merge remote-tracking branch 'cm/cm-12.0' into HEAD
Correct the lockscreen carrier text alignment and text color

In AOSP the text is left aligned, not centered, and the text color is white, not grey

Change-Id: Ie9c77761d3440336ae57abed24c8403bda06be3e