Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Fix immersive mode exit after projection is opened #2582

Merged
merged 1 commit into from
Jan 3, 2020
Merged

Fix immersive mode exit after projection is opened #2582

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
7 changes: 4 additions & 3 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ private void initialize(@NonNull Context aContext) {
closeFloatingMenus();

if (!wasVisible) {
mProjectionMenu.setVisible(true);
mProjectionMenu.show(REQUEST_FOCUS);
}
});

Expand Down Expand Up @@ -676,6 +676,7 @@ private void enterVRVideo(@VideoProjectionMenuWidget.VideoProjectionFlags int aP
mMediaControlsWidget.getPlacement().visible = false;
mWidgetManager.addWidget(mMediaControlsWidget);
mMediaControlsWidget.setBackHandler(mVRVideoBackHandler);
mMediaControlsWidget.setOnClickListener(v -> v.requestFocusFromTouch());
}
mMediaControlsWidget.setProjectionMenuWidget(mProjectionMenu);
mMediaControlsWidget.setMedia(mFullScreenMedia);
Expand Down Expand Up @@ -746,10 +747,10 @@ public void updateServoButton() {

private void closeFloatingMenus() {
if (mProjectionMenu != null) {
mProjectionMenu.setVisible(false);
mProjectionMenu.hide(KEEP_WIDGET);
}
if (mBrightnessWidget != null) {
mBrightnessWidget.setVisible(false);
mBrightnessWidget.hide(KEEP_WIDGET);
}
}

Expand Down