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
Merge pull request #17 from CyanogenMod/cm-11.0

upstream