Merge remote-tracking branch 'schwabe/actionbar_pullrequest'

Conflicts:
	main/res/values/preference_keys.xml
	main/src/cgeo/geocaching/CgeoApplication.java

1 files changed, 6 insertions, 6 deletions

diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
index a98241f..8a1bad6 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.maps.google;
 
+import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.activity.FilteredActivity;
 import cgeo.geocaching.maps.AbstractMap;
 import cgeo.geocaching.maps.CGeoMap;
@@ -97,6 +98,11 @@ public class GoogleMapActivity extends MapActivity implements MapActivityImpl, F
     }
 
     @Override
+    public void goHome(View view) {
+        ActivityMixin.navigateToMain(this);
+    }
+
+    @Override
     public void superOnResume() {
         super.onResume();
     }
@@ -116,12 +122,6 @@ public class GoogleMapActivity extends MapActivity implements MapActivityImpl, F
         return super.onPrepareOptionsMenu(menu);
     }
 
-    // close activity and open homescreen
-    @Override
-    public void goHome(View view) {
-        mapBase.goHome(view);
-    }
-
     @Override
     public void showFilterMenu(View view) {
         // do nothing, the filter bar only shows the global filter