Revert "Clean up search code."

This reverts commit 02eef527a36e4cd44d055abb3c7d7e224f59b938.

Conflicts:
	res/layout/settings_search_complete_view.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/search/SearchPopulator.java
	src/com/android/settings/search/SettingsAutoCompleteTextView.java
	src/com/android/settings/search/SettingsSearchFilterAdapter.java