Set session stack active state based on the window visibility (#1717)

MozillaReality · Aug 30, 2019 · 2f3c8a8 · 2f3c8a8
1 parent 9f84d3f
commit 2f3c8a8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -341,8 +341,6 @@ protected void onPause() {
         }
         mAudioEngine.pauseEngine();
 
-        SessionStore.get().onPause();
-
         mWindows.onPause();
 
         for (Widget widget: mWidgets.values()) {
@@ -365,7 +363,7 @@ protected void onResume() {
             mOffscreenDisplay.onResume();
         }
 
-        SessionStore.get().onResume();
+        mWindows.onResume();
 
         mAudioEngine.resumeEngine();
         for (Widget widget: mWidgets.values()) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -239,6 +239,20 @@ protected void onDismiss() {
         }
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSessionStack.setActive(false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (isVisible()) {
+            mSessionStack.setActive(true);
+        }
+    }
+
     public void close() {
         TelemetryWrapper.closeWindowEvent(mWindowId);
 
@@ -837,6 +851,7 @@ public void setVisible(boolean aVisible) {
         if (mWidgetPlacement.visible == aVisible) {
             return;
         }
+        mSessionStack.setActive(aVisible);
         mWidgetPlacement.visible = aVisible;
         if (!aVisible) {
             if (mIsBookmarksVisible || mIsHistoryVisible) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -364,6 +364,21 @@ public void resumeCompositor() {
 
     public void onPause() {
         saveState();
+        for (WindowWidget window: mRegularWindows) {
+            window.onPause();
+        }
+        for (WindowWidget window: mPrivateWindows) {
+            window.onPause();
+        }
+    }
+
+    public void onResume() {
+        for (WindowWidget window: mRegularWindows) {
+            window.onResume();
+        }
+        for (WindowWidget window: mPrivateWindows) {
+            window.onResume();
+        }
     }
 
     public void onDestroy() {