From 225f03e1065f3765b90ee641336d7c3f256d683b Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Wed, 25 Sep 2013 22:11:58 +0200
Subject: [PATCH] fixed #219

---
 AndroidManifest.xml                                         | 6 ++++++
 src/de/danoeh/antennapod/activity/AddFeedActivity.java      | 2 +-
 src/de/danoeh/antennapod/activity/DownloadActivity.java     | 2 +-
 .../danoeh/antennapod/activity/OrganizeQueueActivity.java   | 2 +-
 .../danoeh/antennapod/activity/PlaybackHistoryActivity.java | 2 +-
 src/de/danoeh/antennapod/activity/PreferenceActivity.java   | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a015c9229..7efc39342 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -134,6 +134,9 @@
         <activity
             android:name=".activity.AudioplayerActivity"
             android:launchMode="singleTop">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="de.danoeh.antennapod.activity.MainActivity" />
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
@@ -336,6 +339,9 @@
             android:name=".activity.VideoplayerActivity"
             android:configChanges="keyboardHidden|orientation"
             android:screenOrientation="landscape">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="de.danoeh.antennapod.activity.MainActivity" />
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
diff --git a/src/de/danoeh/antennapod/activity/AddFeedActivity.java b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
index be0d538c9..82e03f122 100644
--- a/src/de/danoeh/antennapod/activity/AddFeedActivity.java
+++ b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
@@ -217,7 +217,7 @@ public class AddFeedActivity extends ActionBarActivity {
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case android.R.id.home:
-            NavUtils.navigateUpFromSameTask(this);
+            finish();
 			return true;
 		default:
 			return false;
diff --git a/src/de/danoeh/antennapod/activity/DownloadActivity.java b/src/de/danoeh/antennapod/activity/DownloadActivity.java
index 6f08f6c67..001c4abbd 100644
--- a/src/de/danoeh/antennapod/activity/DownloadActivity.java
+++ b/src/de/danoeh/antennapod/activity/DownloadActivity.java
@@ -198,7 +198,7 @@ public class DownloadActivity extends ActionBarActivity implements
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                NavUtils.navigateUpFromSameTask(this);
+                finish();
                 break;
             case MENU_SHOW_LOG:
                 startActivity(new Intent(this, DownloadLogActivity.class));
diff --git a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
index 413978fdd..9bf655855 100644
--- a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
+++ b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
@@ -146,7 +146,7 @@ public class OrganizeQueueActivity extends ActionBarActivity implements
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case android.R.id.home:
-            NavUtils.navigateUpFromSameTask(this);
+            finish();
 			return true;
 		default:
 			return false;
diff --git a/src/de/danoeh/antennapod/activity/PlaybackHistoryActivity.java b/src/de/danoeh/antennapod/activity/PlaybackHistoryActivity.java
index 96b235fbf..0460458eb 100644
--- a/src/de/danoeh/antennapod/activity/PlaybackHistoryActivity.java
+++ b/src/de/danoeh/antennapod/activity/PlaybackHistoryActivity.java
@@ -32,7 +32,7 @@ public class PlaybackHistoryActivity extends ActionBarActivity {
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case android.R.id.home:
-            NavUtils.navigateUpFromSameTask(this);
+            finish();
 			return true;
 		case R.id.clear_history_item:
 			DBWriter.clearPlaybackHistory(this);
diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
index 2360e8a56..c43cfb274 100644
--- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -325,7 +325,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                NavUtils.navigateUpFromSameTask(this);
+                finish();
                 break;
             default:
                 return false;