Lockscreen shortcuts: Fix icon pack usage

Change-Id: I1497cece97f90c76c3930a3a004a2d40416e13ed
Settings: ES translations

Change-Id: I00a0006dd9c8a604ca94bc8d298e6e8e53cd8566
Merge "Lockscreen shortcuts: Fix icon pack usage" into cm-11.0
Merge "Settings: ES translations" into cm-11.0
DisplaySettings: Add hardware-framework support for tap-to-wake

Since we have tap-to-sleep globally, might as well support the
wake gesture as a standalone thing through the HAF. Place it in
"Display".

Change-Id: I6facc2334ff9e80077581c54c428476594e91528
Allow changing screen-off animation (2/2)

* Allow enabling/disabling screen-off animation
* Allow selection between fade & crt effects if the device allows it

Change-Id: I5ebfab22e68ea34e3babfaacd9c8103e25932d3d
Bluetooth: disable scan icon when BT state is off

Usually onScanningStateChanged function should take care
of disabling the scan icon when the scan is completed.

But When the BT scan is going on and try to switch of the
BT, as onScanningStateChanged function doesn't have the
reference for scan icon it will not disable it, so disabling
is taken care in BluetoothSettings on receiving BT Off state.

On receiving BT Off state, disable the scan progress icon only
when available device category is present.

CRs-Fixed: 543777,596214
Change-Id: Ib827903d4f5c80eeb6ac8a06fb1a945140dd20c9
Bluetooth: A2dp: Add A2dp Source UUID

Add A2dp source UUID to A2dp profile UUID list so that
once SDP is performed after pairing, A2dp profile is added
to the cached device instance if remote device supports
either A2dp source or sink role.

Change-Id: I67b16ac2c6fd7a6c2510c80c41dca27c35225a1b
CRs-Fixed: 593841
Bluetooth: Validate the device for A2dpSink

This change will check if remote device supports A2dpSink before
sending A2dp connection Request.

Change-Id: I141099f14b697debce59d094a388de344aad1df1
CRs-fixed: 590200
Settings: PT-BR Translations

Change-Id: I8c335ebae996956b501c44e7ca27c4bcf4e19972
NFC polling mode (2/3)

Change-Id: Ic46ede10fa91f02ca73daa12aa60098c8a52ceef

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java