Settings: Create a security fallback on protected apps.

  -- Allow a user to bypass pattern lock on protected apps
  by inputting their primary account information for the
  device.

Change-Id: I39e5a89a8699cfd2ffaba8aea2daa4f477f2cc9b
Settings: Fix patternlock padding for header.

Change-Id: I8d08c3f3fa72c31fb8be77281f653108392ea1a0
DataUsageSummary: Add CDMA support for showing usage for devices without sim cards

Change-Id: Ib6774b0ad1cd9421a669349321a4f75517f24719
settings: reset protected apps view instead of finish the activity

Finish the app after resettings the account, will lead to the protected app selection without a
valid pattern. Instead this should reset the pattern view to create a new pattern prior to go to
protected apps.

Change-Id: Ida41a29f4f8787940f803a23014a68a2f8beb969
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Fix search highlight matching in some cases.

The attempt at optimizing the loop by skipping the characters that
precede the actual match broke the offset calculations, so the number of
characters skipped in filtering wasn't calculated correctly. Fixit by
removing the misguided optimization.

Example: search for "pera"
highlight in match: Debug non-rectangular cli_p opera_tions
highlight should be: Debug non-rectangular clip o_pera_tions

Change-Id: I07c46b3966e6d81124a5b523c1e822b8750f4f7a
Settings : Dismiss glowpad view on trigger

Change-Id: If24e67549d4286f34bff8bd7f06cc32d4c56b292
Settings: Modify AOSP JA translation

Change-Id: I0994f6148e99d1b479640ead076fb307f225bd66
Automatic translation import

Change-Id: Id47e0dcee33861c2c40110b924057b257050e0dd

Conflicts:

	res/values-af/cm_strings.xml
	res/values-ar/cm_strings.xml
	res/values-ca/cm_strings.xml
	res/values-cs/cm_strings.xml
	res/values-da/cm_strings.xml
	res/values-de/cm_strings.xml
	res/values-el/cm_strings.xml
	res/values-es-rXA/cm_strings.xml
	res/values-es/cm_strings.xml
	res/values-fi/cm_strings.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-in/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-iw/cm_strings.xml
	res/values-ja/cm_strings.xml
	res/values-ku/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-nb/cm_strings.xml
	res/values-nl/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-pt-rBR/cm_strings.xml
	res/values-pt-rPT/cm_strings.xml
	res/values-ro/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values-si/cm_strings.xml
	res/values-sk/cm_strings.xml
	res/values-sr/cm_strings.xml
	res/values-th/cm_strings.xml
	res/values-tr/cm_strings.xml
	res/values-zh-rCN/cm_strings.xml
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4

Conflicts:

	res/xml/display_settings.xml
Vanirify proximity wake

"Help decide whether to wake device up" ==> "Help prevent butt-dialing"
As stockmode being enabled makes removal of proximity wake and removal of double-tap-to-wake both necessary, rejigger conditionalization there-of.
Dave doesn't like preference categories, so removePreference from the display settings root, rather than a non-existent category.

Change-Id: I16f69f78d366d8217c0aa3c3619095b6a887690c
Say buhbye

Change-Id: Id31d497a880b477dac47e22bce1ce34bd127c508
development: Add setting for overwriting recovery

vanirfied

Change-Id: I1ffa1735cd29bcdd5f7be419e4b46cf04a3f9973
Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc

Conflicts:

	AndroidManifest.xml
	res/xml/security_settings_app_cyanogenmod.xml
Highlight all search matches for the given constraint.

Change-Id: I9f1a58ee3e6cd59522c4705bedb1457473201d3c
Settings: Fix camel case

Change-Id: Ibc74affb90757f0680e9ce2aa15bc9c4596ec28b

Conflicts:

	res/values/cm_strings.xml
Missing imgsgs

Change-Id: I48189b4923aabfeb2e959ee2509d71b732d0ff8f
Move notification filtering somewhere it can be found

Change-Id: I17c965a70875a5a9ea5a00a5bd57c19d1f19a1a1