base

ResolverActivity revisions, phase 1

* Switch to grid formatting for items to choose from.

* Format the grid at the bottom of the screen instead of in a formal
  dialog.

* Move to newer theming.

Change-Id: Ie1b23800b3a521570f9f62e4cdef620d3fb491d8