Set correct forecolor when searching

Also removed some dead code

Bug:6378835

Change-Id: I3ed4b6bea1a88777312af0e6c40fac93a9102f1f
5 files changed