Reset Pattern:
 - If user cancels while creating new pattern, old pattern is restored

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
Settings: Add heads up blacklist options. (2/2)

Change-Id: I13d849b49bee6f516b591625c2ea2e69dff12885
Merge "Settings: Add heads up blacklist options. (2/2)" into cm-11.0
Halo master switch (2/2)

This commit remove halo button from status bar expanded and add a new option into halo settings allowing the user to enable or disable it using a checkbox
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

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

Change-Id: I691004aea9ac54ba6d7c6961e853f56cf5f9be3d