Prevent factory reset for short passwords in CryptKeeper

Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java

Conflicts:
	src/com/android/settings/CryptKeeper.java
display: Make advanced settings a category

This was a separate screen but it's too empty for that, let's make
it a category like in CM11 for now. If it ever becomes a separate
screen it needs its own fragment so that navigation is possible
via actionbar.

Change-Id: I4b1f3e78a013412d5e39847683ca622dc76b9fa1
Port: Wake on plug (2/2)

Change-Id: Icdacf8b186d893c2a107d9d61aa5439d777f4523
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
Revert "Port: Wake on plug (2/2)"

This reverts commit fa6298e8a7c5a6c2af456249935e5cb2f0527e90.

Change-Id: Ia2c42e9c6d83dba204c4fe326bc8a477a21b75c0
Port: Wake on plug (2/2)

Change-Id: I22ee2a05040561cca796814573adc5226f1f03d4
Correct double tap to sleep summary

Change-Id: If2e7ab2c138e72eeb7d862738bb7dd3ad43d4b16
Correct development shortcut summary

Change-Id: Ia776d25c8f58789c3eedf16b7d5c705b04130b5f
Improve notification tone string

Change-Id: I731903a7bcda38229502de33dbc83c44e3782996
Protected Apps: update protected apps screens UI

Change-Id: I2dd922956f8ffd9ed153c3d1aa1f9161a127e4c6
Remove unnecessary drawables for launching Protected Apps

Change-Id: I58f471ef9d64c7ced79befbfc30b94d75a0085a2
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 'cm/cm-12.0' into HEAD

Conflicts:
	res/xml/display_settings.xml

Change-Id: I5873dbac3671030fb2346c8d7713de90e8d4fbca