This commit is contained in:
daniel oeh 2013-09-25 22:11:58 +02:00
parent f7ec854c67
commit 225f03e106
6 changed files with 11 additions and 5 deletions

View File

@ -134,6 +134,9 @@
<activity <activity
android:name=".activity.AudioplayerActivity" android:name=".activity.AudioplayerActivity"
android:launchMode="singleTop"> android:launchMode="singleTop">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="de.danoeh.antennapod.activity.MainActivity" />
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
@ -336,6 +339,9 @@
android:name=".activity.VideoplayerActivity" android:name=".activity.VideoplayerActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
android:screenOrientation="landscape"> android:screenOrientation="landscape">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="de.danoeh.antennapod.activity.MainActivity" />
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>

View File

@ -217,7 +217,7 @@ public class AddFeedActivity extends ActionBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
NavUtils.navigateUpFromSameTask(this); finish();
return true; return true;
default: default:
return false; return false;

View File

@ -198,7 +198,7 @@ public class DownloadActivity extends ActionBarActivity implements
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
NavUtils.navigateUpFromSameTask(this); finish();
break; break;
case MENU_SHOW_LOG: case MENU_SHOW_LOG:
startActivity(new Intent(this, DownloadLogActivity.class)); startActivity(new Intent(this, DownloadLogActivity.class));

View File

@ -146,7 +146,7 @@ public class OrganizeQueueActivity extends ActionBarActivity implements
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
NavUtils.navigateUpFromSameTask(this); finish();
return true; return true;
default: default:
return false; return false;

View File

@ -32,7 +32,7 @@ public class PlaybackHistoryActivity extends ActionBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
NavUtils.navigateUpFromSameTask(this); finish();
return true; return true;
case R.id.clear_history_item: case R.id.clear_history_item:
DBWriter.clearPlaybackHistory(this); DBWriter.clearPlaybackHistory(this);

View File

@ -325,7 +325,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
NavUtils.navigateUpFromSameTask(this); finish();
break; break;
default: default:
return false; return false;