Settings:HTC Reflection Effect or iOS Flat
Remove lockscreen slide delay option (1/2)

Also enable these options for insecure lockscreen:
* Lock after timeout
* Power button instantly locks
* Owner info

Change-Id: I7737dc9cb1108f7d83b2cea3af9eb313767eb958
Remove 'More device settings' menu

Change-Id: I86cd84f6f6c408b26c04d92529e9a031c4fed1f7
DisplaySettings: Add hardware-framework support for color enhancement

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

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
Lockscreen Colors/Image [2/2]

Change-Id: I46bb16570916645712b75c05f34235fdbd271650
Partition information menu

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

Change-Id: I13d849b49bee6f516b591625c2ea2e69dff12885

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/cyanogenmod/NotificationDrawer.java
Deduplicate adapter-of-installed-packages code.

Change-Id: I454ba79eddaaff86233a2cc341f4c8bebe94729e