From 91aa65e71709913236b7fa9621f3d622201f28cc Mon Sep 17 00:00:00 2001
From: Marcel Dopita <m@rcel.cz>
Date: Sat, 18 Jan 2020 14:37:42 +0100
Subject: [PATCH] Support display cutout

Fixes #2682
---
 app/src/main/AndroidManifest.xml                  |  3 ++-
 .../schabi/newpipe/player/MainVideoPlayer.java    | 15 +++++++++++++++
 app/src/main/res/values-v28/styles.xml            |  8 ++++++++
 app/src/main/res/values/styles.xml                |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-v28/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f27f4bad0..7ca04eed0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,7 +61,8 @@
             android:name=".player.MainVideoPlayer"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask"
+            android:theme="@style/VideoPlayerTheme"/>
 
         <activity
             android:name=".settings.SettingsActivity"
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
index 3340f1107..f779c7bf9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -45,9 +45,11 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.DisplayCutout;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -550,6 +552,19 @@ public final class MainVideoPlayer extends AppCompatActivity
                     setInitialGestureValues();
                 }
             });
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                queueLayout.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
+                    @Override
+                    public WindowInsets onApplyWindowInsets(View view, WindowInsets windowInsets) {
+                        final DisplayCutout cutout = windowInsets.getDisplayCutout();
+                        if (cutout != null)
+                            view.setPadding(cutout.getSafeInsetLeft(), cutout.getSafeInsetTop(),
+                                    cutout.getSafeInsetRight(), cutout.getSafeInsetBottom());
+                        return windowInsets;
+                    }
+                });
+            }
         }
 
         public void minimize() {
diff --git a/app/src/main/res/values-v28/styles.xml b/app/src/main/res/values-v28/styles.xml
new file mode 100644
index 000000000..92c2d9214
--- /dev/null
+++ b/app/src/main/res/values-v28/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="VideoPlayerTheme">
+        <item name="android:windowLayoutInDisplayCutoutMode">
+            shortEdges
+        </item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8047ef7f4..633003092 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -247,4 +247,6 @@
     <style name="NavViewTextStyle">
         <item name="android:ellipsize">end</item>
     </style>
+
+    <style name="VideoPlayerTheme" />
 </resources>