Gallery2: Fix showOnMap method

If the context is ProxyLauncher, showOnMap will make crash the Gallery app if
GoogleMaps not exists, because the double call to startActivity.
Just query the intent before call the startActivity method.

Change-Id: I55472640e2073dc17a1e2c1630215328ae5effc7
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Gallery2: Fix show on map typo

Change-Id: Ie67b945f20c93972e090ebda0391f6e40a0c7b8d
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge pull request #1 from CyanogenMod/cm-10.1

Cm 10.1