Remove the back handler for non focused views (#2802)

MozillaReality · Feb 21, 2020 · 18aba8b · 18aba8b
1 parent 513cade
commit 18aba8b
Showing 1 changed file with 10 additions and 0 deletions.
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
@@ -639,6 +639,16 @@ public void setActiveWindow(boolean active) {
         updateBorder();
 
         mViewModel.setIsActiveWindow(active);
+
+        // Remove tha back handler in case there is a library view visible, otherwise it gets dismissed
+        // when back is clicked even if other window is focused.
+        if (mView != null) {
+            if (active) {
+                mWidgetManager.pushBackHandler(mBackHandler);
+            } else {
+                mWidgetManager.popBackHandler(mBackHandler);
+            }
+        }
     }
 
     @Nullable