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
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Automatic translation import

Change-Id: Id47e0dcee33861c2c40110b924057b257050e0dd
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/values-af/cm_strings.xml
	res/values-da/cm_strings.xml
	res/values-es-rXA/cm_strings.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-ja/cm_strings.xml
	res/values-ku/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-zh-rCN/cm_strings.xml

Change-Id: I54a197d1439082add507050fbffcd83ef348debe
Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into kk_mkt
Settings: Grammarz

Change-Id: Iba6d30f2df7d0b072fd22cffd7bec2dbe1b519fb
Highlight all search matches for the given constraint.

Change-Id: I9f1a58ee3e6cd59522c4705bedb1457473201d3c
Merge branch 'cm-11.0' into kk_mkt
Update Translations

Change-Id: I6bd5902ab26f43c2419ac2fef5cc406801e48cbe
Settings: mokee bringup

Change-Id: Ibdad26261eb6f0e37a296f0eac1d45adc86554e9
Settings: Fix camel case

Change-Id: Ibc74affb90757f0680e9ce2aa15bc9c4596ec28b
Merge branch 'cm-11.0' into kk_mkt
update mokeepush sdk (4/4)

Change-Id: Ie0f1ded35a893212688ed64141bd48ea3b6fed9e