Merge "Frameworks: Allow enabling call recording (1/3)" into kk
try to fix npes
SystemUI: Modify AOSP EL translation

It's too long to fit in the QS tile

Change-Id: Ib9c64c8b15909de629a70ede10777d06a416b715
qs: fix network tile description

Fix period at the end of the network mobile description, ensure that there isn't
trailing whitespaces and only call one time to the cleaner method when
the description change. Clean up unused imports.

Change-Id: I9b965015e30e44efa00220e91da7e8b3e773a0f1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Broadcast tethered client inteface along with upstream interface name

On change in tethering upstream interface for IPV4 of IPV6 address,
broadcast an intent with both tethered client interface as well as
upstream interface name, ip address type and update type.

Change-Id: I2f23e2b8ec125339bedd454446accb23e33cacae
WiFi: Check data length before extracting

GBK to UTF convertion is carried on input data. The maximum data
that can be supported in framework is BUF_SIZE.
The gerrit is to check the size of input data  prior to parsing,
so that it will not lead to any crashes.

Change-Id: If8ff372dc26317b369643405dcea01ff28c4f1f3
CRs-Fixed: 708416
QuietHours: don't schedule alarms in the past

On the last day of the month, the trigger-alarm for the next day
was actually scheduled on the first day of the current month, which
caused it to fire immediately and then repeating this, leading
to high battery drain.

Fix this by scheduling the next alarm on the real next day.

Change-Id: Ied3b1dd3101650842a798d7e00e2a3a794ac8639
Ringtone: Add support for selection of phone ringtone for SIM-2.

-Issue: "The process android.process.media has stopped" pop up is
 displayed when ringtone for SIM-2 is selected.
-Rootcause: There is no type and URI defined for SIM-2 ringtone
 in the RingtoneManager. This is leading to SQl exception when
 executing a selection query.
-Fix: Add URIs for the SIM-2 and SIM-3 ringtones. Define
 interfaces to return them to app side based on subscription ID.

CRs-Fixed: 612945
Change-Id: If68c2d008dd86d2b55d3fb7f5667bbadc238d0b3
Provider: Add multi SIM ringtone support in SettingsProvider

This change will handle multi-sim queries in
SettingsProvider.java when openFile and
openAssetFile APIs are called by other components.
Thus, it will ensure to play the correct ringtone
corresponding to the SIM.

CRs-Fixed: 661216
Change-Id: I7b22c233b9c41669c1ad948b83a7aa2c55442af1
CallLog: Support for active time in CDMA call log

Display the type(Active time/Call out time) in call log of CDMA call.

Change-Id: Icdc459b0e6aff2ae7f9d44395b6886232de16efe
Themes: Only kill launchers if overlays or icons changed

There is no need to kill the launcher for every coponent changed.
The only ones that really concern us in regards to killing launchers
are MODIFIES_OVERLAYS and MODIFIES_ICONS

Change-Id: I840b8e2ecd4b52a33f352809c5d3d2c7e92ce85e
Add ANT to the list of toggleable airplane mode radios

Adding ANT to the list of toggleable radios allows ANT to behave in the same way as Wifi or
Bluetooth in regards to operation during airplane mode: when airplane mode is turned on, ANT is
disabled, but can be re-enabled by the user at any time.

Change-Id: Idb9e9499fd7a7fccee8c459779ec86bf24e1373e
core: use 'normal' value for notification led off

Users can set this value to 250, 500, 1000, 2500 or 5000ms only,
but it's 2000ms by default.

With this patch, 'Normal' string is shown instead of 'By default'
and pulse speed goes to 1 sec.

Change-Id: Idb18ac345bd9eb1a5b795776faa60e2fb5bc258b
Keyguard: add smart cover support

Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	packages/Keyguard/res/values/cm_strings.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

bring back parts from:
https://github.com/CyanogenMod/android_frameworks_base/commit/99193055525db039b651fc8c88678b6e6e74efc9
removed by:
https://github.com/CarbonDev/android_frameworks_base/commit/135989074ca13cb9a47c478620634d676688272c

Change-Id: I436eba7678b923a9f293e15d786447214bc9bdcb
policy: respect FLAG_TURN_SCREEN_ON flag with device flip covers

If an application uses WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
and the device supports covers and the cover is closed, then after the
screen would turn on due to this flag, it would immediately be turned off
because PhoneWindowManager thinks the cover is closed, so it puts the device to
sleep.

Respect this flag and do nothing if it is detected.

Change-Id: I7eb36ce676730e47c551518e214b08561c401ea5
Signed-off-by: Roman Birg <roman@cyngn.com>
Use actual storage type of sdcard/usb (1/2).

Change-Id: Icaf0d246ab3bdd0614c8bb7a22f8b2b95cbe9c7e
TODO: Provide drawable for usb storage (someone please).
Fix API check derpage

Change-Id: Ib2086febae4c4f3c2caec77d8a78dcb1d0dfc978
watermark: Place watermark in the bottom-right when both deltax and deltaty are 0

The default behavior is to replicate the watermark all over the screen but this can
be too intrusive. The repetition is controlled by deltax and deltay and if they are
both 0 the watermark will actually be drawn off-screen and thus not shown.

We take advantage of this to add a special behavior when they are both 0 that simply
places them in the bottom right. This patch doesn't take UI elements into account and
may actually overlay soft-buttons and other chrome.

Change-Id: I4cff1326b8aaecdbc471eaf48e95bc2865181366
Merge remote-tracking branch 'origin/testing' into kitkat