Make use of picture-in-picture (PIP) for the popup player on Android …

…7.0 and higher.
TeamNewPipe · Aug 8, 2022 · 707904f · 707904f
1 parent 74921d3
commit 707904f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,9 @@
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
 
     <application
         android:name=".App"
@@ -27,8 +30,9 @@
         tools:ignore="AllowBackup">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -13,6 +13,7 @@
 
 import android.animation.ValueAnimator;
 import android.app.Activity;
+import android.app.PictureInPictureParams;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -434,6 +435,17 @@ 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);
+        } else {
+            binding.overlayLayout.setVisibility(View.VISIBLE);
+            binding.tabLayout.setVisibility(View.VISIBLE);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // OnClick
     //////////////////////////////////////////////////////////////////////////*/
@@ -1128,6 +1140,18 @@ private void openBackgroundPlayer(final boolean append) {
     }
 
     private void openPopupPlayer(final boolean append) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            final var pipParams = new PictureInPictureParams.Builder()
+                    .build();
+            requireActivity().enterPictureInPictureMode(pipParams);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            requireActivity().enterPictureInPictureMode();
+        } else {
+            openPreNougatPopupPlayer(append);
+        }
+    }
+
+    private void openPreNougatPopupPlayer(final boolean append) {
         if (!PermissionHelper.isPopupEnabled(activity)) {
             PermissionHelper.showPopupEnablementToast(activity);
             return;