From 90156be1eb67e10e726dfcd06210046ba76c5cfb Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Sat, 4 Jan 2020 00:52:16 +0100
Subject: [PATCH] Use show/hide instead of setVisible to ensure back handler is
 removed (#2582)

---
 .../mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 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
index 4886c0606..a6608e5a0 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
@@ -262,7 +262,7 @@ private void initialize(@NonNull Context aContext) {
             closeFloatingMenus();
 
             if (!wasVisible) {
-                mProjectionMenu.setVisible(true);
+                mProjectionMenu.show(REQUEST_FOCUS);
             }
         });
 
@@ -678,6 +678,7 @@ private void enterVRVideo(@VideoProjectionMenuWidget.VideoProjectionFlags int aP
             mMediaControlsWidget.getPlacement().visible = false;
             mWidgetManager.addWidget(mMediaControlsWidget);
             mMediaControlsWidget.setBackHandler(mVRVideoBackHandler);
+            mMediaControlsWidget.setOnClickListener(v -> v.requestFocusFromTouch());
         }
         mMediaControlsWidget.setProjectionMenuWidget(mProjectionMenu);
         mMediaControlsWidget.setMedia(mFullScreenMedia);
@@ -749,10 +750,10 @@ public void updateServoButton() {
 
     private void closeFloatingMenus() {
         if (mProjectionMenu != null) {
-            mProjectionMenu.setVisible(false);
+            mProjectionMenu.hide(KEEP_WIDGET);
         }
         if (mBrightnessWidget != null) {
-            mBrightnessWidget.setVisible(false);
+            mBrightnessWidget.hide(KEEP_WIDGET);
         }
     }