Skip to content

Fix rotation when auto-rotate is disabled #4254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
blackbox87 wants to merge 1 commit into from
Closed

Fix rotation when auto-rotate is disabled #4254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

/*//////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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;
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down