Merge remote-tracking branch 'origin/master'

Author: weblate

app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt

@@ -313,6 +313,8 @@ object CommonActivity {
     }
 
     fun onUserLeaveHint(act: Activity?) {
+        // On Android 12 and later we use setAutoEnterEnabled() instead.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) return
         if (canEnterPipMode && canShowPipMode) {
             act?.enterPIPMode()
         }

app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt

@@ -55,6 +55,7 @@ import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode
 import java.net.SocketTimeoutException
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
@@ -196,7 +197,7 @@ abstract class AbstractPlayerFragment(
             activity?.let { act ->
                 PlayerPipHelper.updatePIPModeActions(
                     act,
-                    isPlayingRightNow,
+                    act.shouldShowPIPMode(canEnterPipMode),
                     player.getAspectRatio()
                 )
             }