Fix for disappearing context menus (#2376)

Author: keianhzo

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java

@@ -418,7 +418,7 @@ public void detachFromWindow() {
         }
         mAttachedWindow = null;
         if (mAwesomeBar != null && mAwesomeBar.isVisible()) {
-            onHideAwesomeBar();
+            mAwesomeBar.hideNoAnim(UIWidget.KEEP_WIDGET);
         }
     }
 

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/SuggestionsWidget.java

@@ -24,6 +24,7 @@
 import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.audio.AudioEngine;
 import org.mozilla.vrbrowser.ui.views.CustomListView;
+import org.mozilla.vrbrowser.utils.ViewUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -125,11 +126,15 @@ public void hide(@HideFlags int aHideFlags) {
         mList.startAnimation(mScaleDownAnimation);
     }
 
+    public void hideNoAnim(@HideFlags int aHideFlags) {
+        super.hide(aHideFlags);
+    }
+
     // FocusChangeListener
 
     @Override
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        if (oldFocus != null && isVisible()) {
+        if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
             onDismiss();
         }
     }

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SelectionActionWidget.java

@@ -184,7 +184,7 @@ private void handleAction(View sender) {
 
     @Override
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        if (!ViewUtils.isChildrenOf(getChildAt(0), newFocus)) {
+        if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
             onDismiss();
         }
     }

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/ContextMenuWidget.java

@@ -122,7 +122,7 @@ public void setContextElement(GeckoSession.ContentDelegate.ContextElement aConte
 
     @Override
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        if (!ViewUtils.isChildrenOf(this, newFocus) && isVisible()) {
+        if (!ViewUtils.isEqualOrChildrenOf(this, newFocus) && isVisible()) {
             onDismiss();
         }
     }

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java

@@ -123,8 +123,8 @@ private void createMenuItems() {
 
     @Override
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        if (!ViewUtils.isChildrenOf(menuContainer, newFocus)) {
-            hide(KEEP_WIDGET);
+        if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
+            onDismiss();
         }
     }
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/LibraryMenuWidget.java

@@ -140,8 +140,8 @@ private void createMenuItems(boolean canOpenWindows, boolean isBookmarked) {
 
     @Override
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        if (!ViewUtils.isChildrenOf(menuContainer, newFocus)) {
-            hide(KEEP_WIDGET);
+        if (!ViewUtils.isEqualOrChildrenOf(this, newFocus)) {
+            onDismiss();
         }
     }
 }