Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: Icbf706a582279b86d901fb727b58663713606521
Minor typo fix Wi-FI -> Wi-Fi

Change-Id: I457a5cab6de706ab6fd05bf1b9c6c2531cdab4d1
Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1
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
Fix derp.

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

JIRA: CYAN-1703
Change-Id: Ie3c1cf0339d66405d27c06dba07cc80e4001d669
Settings: NL translation

Make notification-shade-collapse-after-dismiss behaviour configurable.

ps2: rebase

Change-Id: I8e9542afa6097efe171c7e71e4c91387e85178c2
Merge "Fix app selection when adding apps to app groups." into cm-10.1
Merge "Sort disabled apps to the end of the list in privacy guard manager." into cm-10.1
Settings: PT-BR translations

Change-Id: I67f3655927bac23bd40a6f7b508927ac850b0964
Merge "Minor typo fix Wi-FI -> Wi-Fi" into cm-10.1
Merge "Settings: NL translation" into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

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