Do not animate navigation bar fullscreen exit in onDestroy (#1786)

MozillaReality · Sep 6, 2019 · 94e847e · 94e847e · community-tc-integration · Mar 18, 2020
1 parent b7ea5d9
commit 94e847e
Showing 1 changed file with 12 additions and 0 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
@@ -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();