From 94e847e605a7652471e586f0e02024f7abd7f269 Mon Sep 17 00:00:00 2001
From: Imanol Fernandez <mortimergoro@gmail.com>
Date: Sat, 7 Sep 2019 00:05:21 +0200
Subject: [PATCH] Do not animate navigation bar fullscreen exit in onDestroy
 (#1786)

---
 .../vrbrowser/ui/widgets/NavigationBarWidget.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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
index e86e3591b..3e089720d 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -334,6 +334,18 @@ public void releaseWidget() {
         mWidgetManager.removeUpdateListener(this);
         mWidgetManager.removeWorldClickListener(this);
         mPrefs.unregisterOnSharedPreferenceChangeListener(this);
+        
+        if (mAttachedWindow != null && mAttachedWindow.isFullScreen()) {
+            // Workaround for https://issuetracker.google.com/issues/37123764
+            // exitFullScreenMode() may animate some views that are then released
+            // so use a custom way to exit fullscreen here without triggering view updates.
+            if (mSessionStack.isInFullScreen()) {
+                mSessionStack.exitFullScreen();
+            }
+            mAttachedWindow.restoreBeforeFullscreenPlacement();
+            mAttachedWindow.setIsFullScreen(false);
+            mWidgetManager.popBackHandler(mFullScreenBackHandler);
+        }
 
         detachFromWindow();