Make search button focus the search field while in search mode

 - Also removed a totally unused class
 - Also turned an enum into an abstract class

Bug:5188996
Change-Id: I0dde1e49b360459f71196b151160a25d24d21343