Bug 1046485 - Move search bar out of SearchFragment 

I think a ViewSwitcher could be helpful in this class. It would remove a few lines of code and a reference, but it would also make the intent very clear: only one of these views will be visible at a given time.