diff --git a/app/src/main/java/org/schabi/newpipelegacy/MainActivity.java b/app/src/main/java/org/schabi/newpipelegacy/MainActivity.java index 6a4e17146..7c7aee197 100644 --- a/app/src/main/java/org/schabi/newpipelegacy/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipelegacy/MainActivity.java @@ -440,9 +440,6 @@ private void showTabs() throws ExtractionException { drawerItems.getMenu() .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history) .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_history)); - drawerItems.getMenu() - .add(R.id.menu_tabs_group, ITEM_ID_BG_PLAYER, ORDER, R.string.background_player) - .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_play_arrow)); //Settings and About drawerItems.getMenu() diff --git a/app/src/main/java/org/schabi/newpipelegacy/player/BackgroundPlayerActivity.java b/app/src/main/java/org/schabi/newpipelegacy/player/BackgroundPlayerActivity.java index 20f46d20c..414b71809 100644 --- a/app/src/main/java/org/schabi/newpipelegacy/player/BackgroundPlayerActivity.java +++ b/app/src/main/java/org/schabi/newpipelegacy/player/BackgroundPlayerActivity.java @@ -1,7 +1,7 @@ package org.schabi.newpipelegacy.player; import android.content.Intent; -import android.util.Log; +import android.view.Menu; import android.view.MenuItem; import org.schabi.newpipelegacy.R; @@ -12,7 +12,6 @@ public final class BackgroundPlayerActivity extends ServicePlayerActivity { private static final String TAG = "BackgroundPlayerActivity"; - private static final boolean DEBUG = BasePlayer.DEBUG; @Override public String getTag() { @@ -73,19 +72,8 @@ public Intent getPlayerShutdownIntent() { return new Intent(ACTION_CLOSE); } - @Override - protected void onDestroy() { - super.onDestroy(); - if (DEBUG) { - Log.d(TAG, "destroy() called"); - } - /* - * Not until we are sure the application main window is actually closed - * For further ref: - * https://developer.android.com/reference/android/ - * app/activityManager.RunningAppProcessInfo - * - * getApplicationContext().sendBroadcast(getPlayerShutdownIntent()); - */ + @Override + public boolean onCreateOptionsMenu(Menu menu) { + return super.onCreateOptionsMenu(menu); } } diff --git a/app/src/main/java/org/schabi/newpipelegacy/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipelegacy/util/NavigationHelper.java index ec76735b7..bfc16780a 100644 --- a/app/src/main/java/org/schabi/newpipelegacy/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipelegacy/util/NavigationHelper.java @@ -149,13 +149,8 @@ public static void playOnPopupPlayer(final Context context, public static void playOnBackgroundPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) { - //Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT) - // .show(); - final Intent playerIntent - = getPlayerIntent(context, BackgroundPlayerActivity.class, queue, resumePlayback); - playerIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(playerIntent); - + Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT) + .show(); startService(context, getPlayerIntent(context, BackgroundPlayer.class, queue, resumePlayback)); }