Add back blacklist settings.

Change-Id: Iae35717acfa9af4da75c07d24352acf981d19fc7

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Improve translatability of summaries.

Change-Id: I362b335cbe219d6e371a458c9d50fcd66bdf19fe
Settings: Alert user when they attempt to add an invalid number to BL.

  - BlacklistProvider will reject numbers that aren't valid, silently. So instead of
  resuming to a blank screen, we should alert the user that the number they attempted to
  add is invalid by utilizing BlacklistUtils#addOrUpdate method.

Change-Id: I1ca32427baad41c1c9379e18046e6ca7937b6d32
Add missing blacklist xxhdpi drawables.

Change-Id: I327f408ff344e9358c479cf5fe9dc341918511b2
Blacklist: Fix launching blacklist settings

Change-Id: I0043503e6ac0d3536941394ee5057001b72f9114

Conflicts:
	src/com/android/settings/SettingsActivity.java
Settings : Launch only contacts picker for blacklist entry

Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
Use SystemSettingSwitchPreference.

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

Match CM 11

Change-Id: I5e3f9c26b68a89ba1622d95e2d0e4f4a93361c5e

Conflicts:
	res/xml/security_settings_app_cyanogenmod.xml
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
Cleanup Security/Privacy settings code

Cleanup:
* Mismerges
* Code style
* Copyright headers
* File permissions

Change-Id: I6c34586680f0ccbaa613a0acfee366113c32a81c

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	src/com/android/settings/SecuritySettings.java
Settings: use CMHW serial number

See http://review.cyanogenmod.org/57164

Change-Id: If328ca7b487435b88246d1f8c47b04770183f09e
Settings: allow home button to wake device [2/2]

Change-Id: I5c887422636f8bc51cb324339b3cdcac7af54400

Conflicts:
	res/values/cm_strings.xml
[1/2] Settings AppOps: show/hide app type and allow/deny counters

Squash of:

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Thu Oct 3 13:51:31 2013 -0700
AppOps: menu options to show/hide user and system apps
Change-Id: Ia55364c361db949a891e4b53a757ee4dff519eb6

Author: Sam Mortimer <sam@mortimer.me.uk>
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Oct 2 22:24:14 2013 -0700
[1/2] AppOps: Show allowed/ignored counts
Change-Id: Ia27737155c33e934df9a2a1fcff88379240fd096

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Sun Dec 1 21:39:07 2013 -0800
AppOps: only apply app type filters to summary screen
    *) If buildState() is called for a single package, do
       not apply hide user/system app filters.
    *) Fixes show detail display when called via
       long press in privacyguard and an AppOp hide
       filter is ticked.
Change-Id: If31d094fb989836ab6829daeefe820695032c0ed

Change-Id: I4d6f37b3923eb9bc98d67101d6f0ef481a427682

Conflicts:
	res/values/cm_strings.xml