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 Only AOGP Version Not CyanogenMod

Removes The CyanogenMod Version in About Phone
Launch SuperSU from Settings

If SuperSU is installed, show an entry in Settings below
"Developer options", which launches SuperSU when tapped.
At boot time SuperSU will detect if com.android.settings
contains the resources from this patch, and if so it
will hide itself from the launcher. This was implemented
in v1.85, so we only show the entry if the installed
SuperSU version is at least that.

PS3 - Added material green icons for SU

Change-Id: I2af95a1a4396101ff87448cd0ae20addf235af52

Conflicts:
	res/values/strings_aicp.xml
Revert "Add Modver to Settings."

This reverts commit 7c63ed0f9421204d638a723bfbb81d0405a8f6b0.

Conflicts:
	res/values/cm_strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
Settings: Forward port ADB over network (Part 1 of 2)

Squashed commit of:
- Adb over network (Settings part for Jellybean)
  + Display WiFi IP Address & Port as preference summary.
  Note: adb_over_network were already pushed in 5555aae
  Author: Tanguy Pruvot
  Id: Ia05aa8f6281c9bdcb3d5e62566b103c38bc70b82

- Settings : Fix mismatched dialog listener
  Set listener on correct dialog
  Author: Danesh Mondegarian
  Id: I0c05af859ad0e93ba6a1d3d395dc6c31e9949426

- ADB: missing dialog dismiss, and use updateCheckBox()
  this function check if debug features are enabled.
  Author: Tanguy Pruvot
  Id: I675a3a9ce5c28b16f9e13e78499e5f6f897b9dd3

- DevelopmentSettings: Refactor ADB over Network
  The checkbox would never enable adbd in tcpip mode.
  Author: Alexander Hofbauer
  Id: Iab8307bb91f69d85ed3a46d5ef09274fa8b03da

Patchset 2 : Remove dupe checkbox and move to proper header

[mikeioannina]: Update for L

Change-Id: I3d61408946912fa0e5f796531413c78255257efe
Settings: Volume key cursor control (2/2)

Change-Id: Ibc52b5d0c59558be9a24286ef6f1c6f049e117a3
settings: port IME selector notification toggle (1/2)

Change-Id: Idb29f94aa4be51166b24b59930428401ddd7416b

Conflicts:
	res/values/cm_strings.xml
Revert "Settings: Volume key cursor control (2/2)"

This reverts commit b824d66d52f7437fa2b4df4f6715ee83eedfd421.

Conflicts:
	res/values/cm_strings.xml
Revert "settings: port IME selector notification toggle (1/2)"

This reverts commit 571999a32bde106181165b5e5ed31374b3387ce4.

Conflicts:
	res/values/cm_strings.xml
Added Mod Version String 

Removed by One commit
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

Conflicts:
	res/xml/display_settings.xml
Port: Wake on plug (2/2)

Change-Id: Icdacf8b186d893c2a107d9d61aa5439d777f4523

Conflicts:
	res/xml/display_settings.xml
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

Conflicts:
	src/com/android/settings/DisplaySettings.java
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
Material > Material.Light

Change-Id: Ia5a2e2b3256b9b29a7fded74fd58db5d07ecbb42
Darkness fixes

Change-Id: I029fd9ad04d288e7f7f841c347ec268129673104
Darkness prevails

Change-Id: I62ea08cd05855496b58ebcc38baa3e6cc3efb946
Revert "Added Mod Version String "

This reverts commit 502927228640e6e2d13740c23abc3a29ddefe655.