Fix rotation when when auto-rotate is disabled

TeamNewPipe · Sep 11, 2020 · 5fd26a2 · 5fd26a2
1 parent 530f745
commit 5fd26a2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
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
@@ -1421,13 +1421,6 @@ private void restoreDefaultOrientation() {
         if (player != null && player.isFullscreen()) {
             player.toggleFullscreen();
         }
-        // This will show systemUI and pause the player.
-        // User can tap on Play button and video will be in fullscreen mode again
-        // Note for tablet: trying to avoid orientation changes since it's not easy
-        // to physically rotate the tablet every time
-        if (!DeviceUtils.isTablet(activity)) {
-            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -1937,6 +1930,11 @@ public void onScreenRotationButtonClicked() {
             return;
         }
 
+        if (isLandscape() && PlayerHelper.globalScreenOrientationLocked(activity)) {
+            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            return;
+        }
+
         final int newOrientation = isLandscape()
                 ? ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
                 : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -743,6 +743,15 @@ public void toggleFullscreen() {
                 return;
             }
 
+            // This makes the button function correctly if you disable auto-rotate
+            // while watching a vertical video and your phones in landscape
+            final boolean orientationLocked = PlayerHelper.globalScreenOrientationLocked(service);
+            final boolean isTablet = DeviceUtils.isTablet(service);
+            if (orientationLocked && isFullscreen && service.isLandscape() && !isTablet) {
+                fragmentListener.onScreenRotationButtonClicked();
+                return;
+            }
+
             isFullscreen = !isFullscreen;
             setControlsSize();
             fragmentListener.onFullscreenStateChanged(isFullscreen());