Settings: disable lock screen heads up (2/2)

This disables heads up notifications from showing
on the lock screen while using wake on notification

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

Change-Id: Ib6774b0ad1cd9421a669349321a4f75517f24719
Merge "DataUsageSummary: Add CDMA support for showing usage for devices without sim cards" into kitkat3
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 "Fix search highlight matching in some cases." into kitkat3
Highlight all search matches for the given constraint.

Conflicts:
	src/com/android/settings/search/SettingsSearchFilterAdapter.java

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

Conflicts:
	src/com/android/settings/liquid/LockscreenTargets.java

Change-Id: I36b34e9e5878b1e2c74f276543ed93b58dabb961
Merge "Settings : Dismiss glowpad view on trigger" into kitkat3
Settings: Don't crash if we pause too quickly

Notifier is unregistered in every case in pause.
However, if you close the Settings app too quick, the notifier
might not be registered at all, causing an IllegalArgumentException
during the unregistering.

Conflicts:
	src/com/android/settings/Settings.java

Change-Id: I9cd8934c3dd208cc6d78143de5d1457995e06c5c
Merge pull request #1 from LiquidSmooth/kitkat3

source is uptodate