Add summary to notification filtering

Change-Id: Ie02165f72e67b2fc6aa086de61303a53a7ee4470

Conflicts:

	res/xml/security_settings_app_cyanogenmod.xml
Disable settings search on all subactivities.

This leaves the search in place in multi-pane configurations, and keeps
it only in the main settings screen for single-pane configurations.

Change-Id: I2db74193d534b66e1faf20293996c611621dfe58

Conflicts:

	src/com/android/settings/Settings.java
Hey look! some more poo flung during the HALO port.

removes a random line from notification_drawer.xml... it's weird that this isn't a syntax error?

Change-Id: If0fba7fce84ee7bcbdf2155bdd9d6c79abad6de7
Merge remote-tracking branch 'upstream/kk44' into kk44