1 files changed, 12 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StatisticsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StatisticsFragment.java
index b455a10ee..2c72ab75b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StatisticsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StatisticsFragment.java
@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
@@ -30,6 +31,7 @@ public class StatisticsFragment extends Fragment {
 
     private TabLayout tabLayout;
     private ViewPager2 viewPager;
+    private Toolbar toolbar;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -43,6 +45,7 @@ public class StatisticsFragment extends Fragment {
 
         View rootView = inflater.inflate(R.layout.pager_fragment, container, false);
         viewPager = rootView.findViewById(R.id.viewpager);
+        toolbar = rootView.findViewById(R.id.toolbar);
         viewPager.setAdapter(new StatisticsPagerAdapter(this));
         // Give the TabLayout the ViewPager
         tabLayout = rootView.findViewById(R.id.sliding_tabs);
@@ -59,7 +62,12 @@ public class StatisticsFragment extends Fragment {
             }
         }).attach();
 
-        rootView.findViewById(R.id.toolbar).setVisibility(View.GONE);
+        if (getActivity().getClass() == PreferenceActivity.class) {
+            rootView.findViewById(R.id.toolbar).setVisibility(View.GONE);
+        } else {
+            toolbar.setTitle(getString(R.string.statistics_label));
+            toolbar.setNavigationOnClickListener(v -> getParentFragmentManager().popBackStack());
+        }
 
         return rootView;
     }
@@ -67,7 +75,9 @@ public class StatisticsFragment extends Fragment {
     @Override
     public void onStart() {
         super.onStart();
-        ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.statistics_label);
+        if (getActivity().getClass() == PreferenceActivity.class) {
+            ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.statistics_label);
+        }
     }
 
     public static class StatisticsPagerAdapter extends FragmentStateAdapter {