Use correct property for 16bpp alpha performance option

persist.sys.use_16bpp_alpha -> persist.sys.prefer_16bpp

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

Change-Id: Ib6774b0ad1cd9421a669349321a4f75517f24719
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
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
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings : Dismiss glowpad view on trigger

Change-Id: If24e67549d4286f34bff8bd7f06cc32d4c56b292
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings: Modify AOSP JA translation

Change-Id: I0994f6148e99d1b479640ead076fb307f225bd66
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Automatic translation import

Change-Id: Id47e0dcee33861c2c40110b924057b257050e0dd
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'androidarmv6/cm-11.0'