Merge remote-tracking branch 'schwabe/actionbar_pullrequest'

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

1 files changed, 19 insertions, 9 deletions

diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index 542dd05..42eb825 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -13,20 +13,22 @@ import cgeo.geocaching.utils.TranslationUtils;
 
 import org.apache.commons.lang3.StringUtils;
 
+import rx.Subscription;
+import rx.subscriptions.Subscriptions;
+
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.ActionBarActivity;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.widget.EditText;
-import rx.Subscription;
-import rx.subscriptions.Subscriptions;
 
 import java.util.Locale;
 
-public abstract class AbstractActivity extends FragmentActivity implements IAbstractActivity {
+public abstract class AbstractActivity extends ActionBarActivity implements IAbstractActivity {
 
     protected CgeoApplication app = null;
     protected Resources res = null;
@@ -43,11 +45,7 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
 
     @Override
     final public void goHome(final View view) {
-        ActivityMixin.goHome(this);
-    }
-
-    final protected void setTitle(final String title) {
-        ActivityMixin.setTitle(this, title);
+        ActivityMixin.navigateToMain(this);
     }
 
     final protected void showProgress(final boolean show) {
@@ -71,7 +69,19 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+
         initializeCommonFields();
+
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId()== android.R.id.home) {
+            ActivityMixin.navigateToMain(this);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     public void onResume(final Subscription resumeSubscription) {