Make sure to not crash if DSP manager and/or development apps are
deactivated or deleted.

Change-Id: I92ea5a44bedbb036d59dde11e83052338e9765e8
Fix adding apps to lockscreen targets without explicit icon selection.

Change-Id: I28c5a2fb72aabd892cc861d592ef20bcbf9fb891
First pass at generic hardware tunables support

With support for vibrator intensity and kcal

Change-Id: Ice3444b31a9ab0a25cf25bebb18351e2c08a70c3
Display options: allow configuration of wake on plug behavior (1/2)

Adds a global setting to the Display section to enable or disable wake-on-plug.
Default is disabled.  When enabled, the device will wake when the charger
is connected or disconnected.  When disabled, the device's wake state
will be left alone.

PS 2: Change wording of setting per DvT's recommendation

PS 3: Pull default value of setting from config.xml

PS 4: Reduce scope of variable

PS 5,6: Rebase

Cherry-picked from: I779a4aa4feeca87879c932be6e1fa032e4b4afc8

Change-Id: I106b7d901a788c19e08454d6231daebf3ff4872c
Merge "Fix adding apps to lockscreen targets without explicit icon selection." into cm-10.2
Merge "Display options: allow configuration of wake on plug behavior (1/2)" into cm-10.2
Merge "Make sure to not crash if DSP manager and/or development apps are deactivated or deleted." into cm-10.2
Clean up lockscreen target configuration code (2/2)

Get rid of a lot of duplicated code.

Change-Id: I03faf36d5e767053072f1809f670882600ea0830
Avoid NPE if icon assignment failed for whatever reason.

Change-Id: Iba4188d6b42179008154b8cbcbb14c36a22669de
Settings: grammer fix in config.xml

Change-Id: If7e7f8fa2292c10a74daac64d7875fbbe993db48
PBAP: Fix device name update on authorization prompt from Notification.

Use FLAG_ONE_SHOT for Notification PendingIntent to launch
authorization prompt and display the updated device name for
every new PBAP connection request.

Change-Id: Ic9cbed92e2856ed2d2f4f807f7f8c39df7f98762
CRs-fixed: 515221
Bluetooth : Remove out of range devices after ScanComplete

Change to remove device from UI when Bluetooth of remote
device is off or not discoverable anymore. Without this
change a device that discovered previously is available
in available devices list always, though the remote device
is not discoverable anymore. The current change updates
available devices list on scan complete removing the
devices that are available in cached devices and are not
disvorable anymore.

Change-Id: I97809fcafd904271121e26741e50a9b61f0e0664
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

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

Change-Id: Ia5712cf9d2819979dac7194d2928407ba7c5c474