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

Conflicts:

	res/xml/notification_drawer.xml
	src/com/android/settings/cyanogenmod/NotificationDrawer.java
DisplaySettings: Add hardware-framework support for color enhancement

Change-Id: I9fa4e7409266ce9e658c93ae32940050cfe437d2

Conflicts:

	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Merge remote-tracking branch 'upstream/kk44' into kk44

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/NotificationDrawer.java