Fix abundance of "Custom" labels.

Not sure precisely why this changed, but hopefully this logic is
more robust. Show the geocoded location if there is no name to use
and a location is available.

Removed GEOCODE_AS_LABEL, which wasn't really used anymore.

Bug: 21814339
Change-Id: I1343282ef415647853d7995d900a3f50186ad156
4 files changed
tree: da0b64aee475a9d7ec0792e79546e7f2c90dca6e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags