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
Allow home button to wake device [2/2]

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

Android 5.0.1 release 1
Settings: Convert AppOps array items to string references

* Avoid future breakage
 This will need conversion of all AOSP translated arrays to strings

Change-Id: I2e52e4013d1232d529ce5b9e3aae3502c42e938a
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
Remove activity tags with fragments from Manifest

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

Match CM 11

Change-Id: I5e3f9c26b68a89ba1622d95e2d0e4f4a93361c5e
privacy: Actually set the blacklist preference

The preference was not being set, which caused this code to throw an NPE on
devices without telephony when opening the privacy preferences.

This bug also affects devices with telephony in that the preference doesn't
update its text. I also got rid of the null check because the preference
always exists, the null check is pointless and ended up hiding this bug.

Change-Id: I95555d44349700a8f29a71a2f2ee9aedf419b49b
bluetooth: Don't crash when the local adapter is not set

In devices where bluetooth is not working (like the emulator or devices
in development), the bluetooth Settings crashes when closing the activity.

Most of the code checks for the nullability of the local adapter except
for this particular piece. This is usually not a worry for production
devices and I wouldn't usually worry about this but since the rest of the
code performs the nullability check it seems silly to crash onPause.

Change-Id: I7c1d3b43969b516336be770957008ef2054d312f
Merge "Allow home button to wake device [2/2]" into lollipop
Settings: Material Black

Liquid Edit: Remove DarkKat Branding

Change-Id: I8fd49b6ad89036edbb5b7a0679b0ecddf5cd66dc
Merge "Settings: Material Black" into lollipop
Add an option to disable searchbar in recents [1/2]

Liquid Edit: Used switch prefence instead of checkbox and edited the summary string a tiny bit

Credit: yashade2001

Change-Id: Ifff2ced1ac2a93211b5c22c9f22fa0a44a5d2f04
AppOps: Fix build

We call Liquid arrays not CM

Change-Id: Ibf5a1204392214244b93316cc05bc715af3c81ef
Forward Port: Add Camera shutter sound [2/3]

Change-Id: I3ed04229c51d578b874328297eac5e9e255f51f0
Settings: Media Scanner on boot behaviour (2/3)

Settings part - fb part is merged and mediaprovider repo was patched up to LP

Change-Id: Ib9cf62b0e3550e6557248cd3d910908882a91c7f
Settings: add quick pulldown listpreference

as well respect rtl layout changes

Change-Id: I298794651302a34817d8212f7af9ad565d504c3c
IllegalStateException fixed in print service settings

Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).

Change-Id: If9c76fe3ff040c295f0af9c092e8824b9a1371d7
Settings: Fix devloper options FC and remove all bug report options

This change: https://gerrit.slimroms.net/#/c/18820/

removed it just in the xml which is a pretty bad idea if java code
still assumes it is there.

Due that we will never need it we remove the code completely.

As well remove bug report in power menu option.

Change-Id: I234dee3a19639f89b5a7b5295ca408142e4223dc
Settings: Developer Settings - We want consistence...change from CheckBox…

Switch to SwitchPreference

Change-Id: I402b0e3cda4f8e2c49787a1455acabcfd4220ac5