Add setting to configure popup player mode.

Author: Isira-Seneviratne

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -33,7 +33,6 @@
 import android.provider.Settings;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.Rational;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -439,20 +438,13 @@ public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
 
     @Override
     public void onPictureInPictureModeChanged(final boolean isInPictureInPictureMode) {
-        if (isInPictureInPictureMode) {
-            binding.overlayLayout.setVisibility(View.GONE);
-            binding.tabLayout.setVisibility(View.GONE);
-            binding.detailContentRootLayout.setVisibility(View.GONE);
-            if (binding.relatedItemsLayout != null) {
-                binding.relatedItemsLayout.setVisibility(View.GONE);
-            }
-        } else {
-            binding.overlayLayout.setVisibility(View.VISIBLE);
-            binding.tabLayout.setVisibility(View.VISIBLE);
-            binding.detailContentRootLayout.setVisibility(View.VISIBLE);
-            if (binding.relatedItemsLayout != null) {
-                binding.relatedItemsLayout.setVisibility(View.VISIBLE);
-            }
+        final int visibility = isInPictureInPictureMode ? View.GONE : View.VISIBLE;
+        binding.overlayLayout.setVisibility(visibility);
+        binding.tabLayout.setVisibility(visibility);
+        binding.detailContentRootLayout.setVisibility(visibility);
+        binding.viewPager.setVisibility(visibility);
+        if (binding.relatedItemsLayout != null) {
+            binding.relatedItemsLayout.setVisibility(visibility);
         }
     }
 
@@ -1150,16 +1142,16 @@ private void openBackgroundPlayer(final boolean append) {
     }
 
     private void openPopupPlayer(final boolean append) {
+        final var popupMode = PreferenceManager.getDefaultSharedPreferences(activity)
+                .getString(getString(R.string.popup_configuration_key),
+                        getString(R.string.popup_mode_legacy));
         final var isPipAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
                 && requireContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+                .hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
+                && popupMode.equals(getString(R.string.popup_mode_pip));
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isPipAvailable) {
-            final var videoPlayerUi = player.UIs().get(VideoPlayerUi.class).orElse(null);
             final var pipParams = new PictureInPictureParams.Builder();
-            if (videoPlayerUi != null) {
-                final var videoView = videoPlayerUi.getBinding().getRoot();
-                pipParams.setAspectRatio(new Rational(videoView.getWidth(), videoView.getHeight()));
-            }
             requireActivity().enterPictureInPictureMode(pipParams.build());
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isPipAvailable) {
             requireActivity().enterPictureInPictureMode();