Fixes full screen exit issues (#3220)

MozillaReality · Apr 22, 2020 · 9c338d8 · 9c338d8
1 parent 95c72d4
commit 9c338d8
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -152,11 +152,15 @@ private void initialize(@NonNull Context aContext) {
 
         mNavigationListeners = new ArrayList<>();
 
-        mFullScreenBackHandler = this::exitFullScreenMode;
+        mFullScreenBackHandler = () -> {
+            if (mAttachedWindow != null) {
+                mAttachedWindow.setIsFullScreen(false);
+            }
+        };
         mVRVideoBackHandler = () -> {
             exitVRVideo();
-            if (mViewModel.getAutoEnteredVRVideo().getValue().get()) {
-                exitFullScreenMode();
+            if (mAttachedWindow != null) {
+                mAttachedWindow.setIsFullScreen(false);
             }
         };
 
@@ -278,7 +282,9 @@ private void updateUI() {
 
         mBinding.navigationBarFullscreen.fullScreenExitButton.setOnClickListener(view -> {
             view.requestFocusFromTouch();
-            exitFullScreenMode();
+            if (mAttachedWindow != null) {
+                mAttachedWindow.setIsFullScreen(false);
+            }
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
@@ -601,7 +607,7 @@ private void enterFullScreenMode() {
     }
 
     private void exitFullScreenMode() {
-        if (mAttachedWindow == null || !mViewModel.getIsFullscreen().getValue().get()) {
+        if (mAttachedWindow == null) {
             return;
         }