Re-add lockscreen music controls setting.

Change-Id: If137978d5c0fa197e75707fd6fe7b09c850de454
Fix app selection when adding apps to app groups.

- Don't drop separate apps with the same title
- Sort case-insensitive
- Sort disabled apps to the end of the list

Change-Id: Iffadca4896468aaee5fcfd60f8776c2bb1a8ce7f
Reenable split action bar for profile settings.

Change-Id: I5af3f0fd7cafaab6f2d9152df943658170fc58ce
Sort disabled apps to the end of the list in privacy guard manager.

JIRA: CYAN-1707
Change-Id: Ie3c1cf0339d66405d27c06dba07cc80e4001d669
Merge "Re-add lockscreen music controls setting." into cm-10.2
Merge "Reenable split action bar for profile settings." into cm-10.2
Merge "Fix app selection when adding apps to app groups." into cm-10.2
Merge "Sort disabled apps to the end of the list in privacy guard manager." into cm-10.2
Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: Icbf706a582279b86d901fb727b58663713606521
Settings: Tweak strings for notification drawer auto close

Change-Id: I5aa8c8a6876aad59cf578d31edfa8a099d2dbd97
Settings: Use US spelling of behaviour

Change-Id: I75d2f4d35e29fe9cd4da3852f2579804910a6dfc
Settings: Align Notification drawer behavior layout w design guidelines

A category is not needed for a single item - use the item title to
indicate it instead

Change-Id: Iffc78b3fd20fd29832b8f9baae322c79e4af8c87
Merge branch 'cm-10.2' into HEAD

Conflicts:
	res/xml/notification_drawer.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
	src/com/android/settings/cyanogenmod/NotificationDrawer.java
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: I8e38521affdf4a62b462d3113124b77e083d4580
Revert "Add App Ops ts Settings"

This reverts commit c29d1aec75e93860c774a1ed70474964bd1d6d35.
Unefy all teeeh contentresolvers

Change-Id: I21f99b0fb9a25b94cef3152dfebd672c6544126e
Settings: ES translations

- Notification drawer behavior

Change-Id: Id6e1263a797a3ce54da35d286474b961ecf0a6f4
Settings: Generic Blacklist support (1 of 5)

Change-Id: I58aff50637b9bf71095ec791e16efd520e6c29a3
Also remove preferences if app is installed, but disabled.

Change-Id: I7f23e7a05c336bd16cda3426c7b31922cb92e1b2
JIRA:CYAN-1861
Merge "Also remove preferences if app is installed, but disabled." into cm-10.2
Merge "Settings: Generic Blacklist support (1 of 5)" into cm-10.2