Revert "Settings: add quick pulldown listpreference"

This reverts commit 0f5a32e9682c0f8f905b33e4ef3327b74ddc00be.
Revert "Status bar brightness control"

This reverts commit ffd3336438acd6f75971f704e24de6f40e413eed.
brightness settings
Port: Wake on plug (2/2)
Settings: Add proximity wake option

Ports and combines:

http://review.cyanogenmod.org/#/c/66658/
Settings : Add preference for proximity wake

http://review.cyanogenmod.org/#/c/69347/
Proximity Wake-Up : adjust strings

http://review.cyanogenmod.org/#/c/69803/
Settings : Make proximity opt-in

Change-Id: Iea0853eccf764438c7aaac76afd13c364fcea0ec
Settings: Port "Development shortcut" (1/2)

New setting under "Debug settings" that enables the development shortcut
Change-Id: I9a43e611911f2e278605715f714860ad11236fd9

Modify the Development shortcut help text
Change-Id: Iaa6d87f5044a46e8c0f8d88a4fc9bf9a494188b8

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
Settings: Fix no preferred APN

Add preferred APN if found no match.

CRs-Fixed: 748830

Change-Id: Ibecf88a3e6236de13a0a4291438a6e62159a05e0
packages: settings: CryptKeeper: Disable FDE if PFE activated

Don't allow Full-Disk-Encryption (FDE) after Per-File-Encryption (PFE)

Change-Id: I5ed46d4362f6536a6cf526aa5bf4bac4610c47b6
Remove activity tags with fragments from Manifest

Change-Id: I95118ebe7b876cf29ee0bfdfe876ebd839619b89
Correct double tap to sleep summary

Change-Id: If2e7ab2c138e72eeb7d862738bb7dd3ad43d4b16
Correct
Protected Apps: update protected apps screens UI

Change-Id: I2dd922956f8ffd9ed153c3d1aa1f9161a127e4c6
Move Blacklist and Notif Filter to Privacy

Match CM 11

Change-Id: I5e3f9c26b68a89ba1622d95e2d0e4f4a93361c5e
Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
Development Settings: fix Advanced reboot not being updated on resume

Change-Id: I5475bec978c9cf50c02769091dbb43c6eff6c020
Merge remote-tracking branch 'origin/5.0-dev' into dark1