Skip to content

Remember and restore orientation on fullscreen exit #12781

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

Merged
TobiGr merged 4 commits into from
Dec 14, 2025
Merged

Remember and restore orientation on fullscreen exit #12781

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4cc1d1
feat(player): Remember and restore orientation on fullscreen exit
iampopovich Nov 9, 2025
d1cbc17
Merge branch 'dev' into feat/similar-youtube-client-screen-rotation
TobiGr Nov 29, 2025
d770c6f
Fix state access
TobiGr Dec 10, 2025
17ce699
Do not change orientation on TVs when entering fullscreen
TobiGr Dec 10, 2025
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
33 changes: 21 additions & 12 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 @@ -206,6 +206,8 @@ public final class VideoDetailFragment
int lastStableBottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
@State
protected boolean autoPlayEnabled = true;
@State
private int originalOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

@Nullable
private StreamInfo currentInfo = null;
Expand Down Expand Up @@ -1900,22 +1902,29 @@ public void onFullscreenStateChanged(final boolean fullscreen) {

@Override
public void onScreenRotationButtonClicked() {
// In tablet user experience will be better if screen will not be rotated
// from landscape to portrait every time.
// Just turn on fullscreen mode in landscape orientation
// or portrait & unlocked global orientation
final boolean isLandscape = DeviceUtils.isLandscape(requireContext());
if (DeviceUtils.isTablet(activity)
&& (!globalScreenOrientationLocked(activity) || isLandscape)) {
player.UIs().get(MainPlayerUi.class).ifPresent(MainPlayerUi::toggleFullscreen);
final Optional<MainPlayerUi> playerUi = player != null
? player.UIs().get(MainPlayerUi.class)
: Optional.empty();
if (playerUi.isEmpty()) {
return;
}

final int newOrientation = isLandscape
? ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
: ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
// On tablets, just toggle fullscreen UI without orientation change.
if (DeviceUtils.isTablet(activity)) {
Comment thread
TobiGr marked this conversation as resolved.
Outdated
playerUi.get().toggleFullscreen();
return;
}

activity.setRequestedOrientation(newOrientation);
if (playerUi.get().isFullscreen()) {
// EXITING FULLSCREEN
playerUi.get().toggleFullscreen();
activity.setRequestedOrientation(originalOrientation);
} else {
// ENTERING FULLSCREEN
originalOrientation = activity.getRequestedOrientation();
playerUi.get().toggleFullscreen();
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
}
}

/*
Expand Down