Lockscreen shortcuts: Fix icon pack usage

Change-Id: I1497cece97f90c76c3930a3a004a2d40416e13ed
Settings: ES translations

Change-Id: I00a0006dd9c8a604ca94bc8d298e6e8e53cd8566
Settings: Add some more entries into 'SMS message limit' menu

Add None, 5 and 10 entries into 'SMS message limit' menu.

Change-Id: I8b206ae6c9f73378da65b09e68898de31439cc59
Settings: DE translation for new quiet hours ringer settings

Change-Id: I3b0066da90641c52091c708ff033f1602f4c4e3c
Settings: remove unused Quiet Hours string from translations

ps2: Cid is being weird...

Change-Id: I707e991a463e1ffa2a5b351b1d20deb47a10f869
Merge "Settings: Add some more entries into 'SMS message limit' menu" into cm-11.0
Merge "Settings: remove unused Quiet Hours string from translations" into cm-11.0
Merge "Settings: DE translation for new quiet hours ringer settings" into cm-11.0
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
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values-pt/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: I23b6f5b31467a24cd56f5b4bea964f824751a66e
Merge pull request #1 from vineethraj49/cm-11.0

Merge upstream