Dismiss the projection menu when clicking on any other media button (#…

…2368)
MozillaReality · Nov 25, 2019 · 986bf58 · 986bf58
1 parent 45078e7
commit 986bf58
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java
@@ -85,11 +85,13 @@ private void initialize(Context aContext) {
             } else {
                 mMedia.play();
             }
+
+            mMediaPlayButton.requestFocusFromTouch();
         });
 
         mMediaSeekBackButton.setOnClickListener(v -> {
             mMedia.seek(Math.max(0, mMedia.getCurrentTime() - 10.0f));
-
+            mMediaSeekBackButton.requestFocusFromTouch();
         });
 
         mMediaSeekForwardButton.setOnClickListener(v -> {
@@ -98,6 +100,7 @@ private void initialize(Context aContext) {
                 t = Math.min(mMedia.getDuration(), t);
             }
             mMedia.seek(t);
+            mMediaSeekForwardButton.requestFocusFromTouch();
         });
 
         mMediaProjectionButton.setOnClickListener(v -> {
@@ -111,7 +114,12 @@ private void initialize(Context aContext) {
                 placement.rotationAxisY = 1.0f;
                 placement.rotation = (float) Math.toRadians(-7);
             }
-            mProjectionMenu.getPlacement().visible = !mProjectionMenu.getPlacement().visible;
+            if (mProjectionMenu.isVisible()) {
+                mProjectionMenu.hide(KEEP_WIDGET);
+
+            } else {
+                mProjectionMenu.show(REQUEST_FOCUS);
+            }
             mWidgetManager.updateWidget(mProjectionMenu);
         });
 
@@ -122,13 +130,14 @@ private void initialize(Context aContext) {
                 mMedia.setMuted(true);
                 mVolumeControl.setVolume(0);
             }
+            mMediaVolumeButton.requestFocusFromTouch();
         });
 
         mMediaBackButton.setOnClickListener(v -> {
             if (mBackHandler != null) {
                 mBackHandler.run();
             }
-
+            mMediaBackButton.requestFocusFromTouch();
         });
 
         mSeekBar.setDelegate(new MediaSeekBar.Delegate() {
@@ -137,6 +146,7 @@ public void onSeekDragStart() {
                 mPlayOnSeekEnd = mMedia.isPlaying();
                 mMediaSeekLabel.setVisibility(View.VISIBLE);
                 mMedia.pause();
+                mSeekBar.requestFocusFromTouch();
             }
 
             @Override
@@ -180,6 +190,7 @@ public void onSeekPreview(String aText, double aRatio) {
             if (mMedia.isMuted()) {
                 mMedia.setMuted(false);
             }
+            mVolumeControl.requestFocusFromTouch();
         });
 
         this.setOnHoverListener((v, event) -> {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/VideoProjectionMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/VideoProjectionMenuWidget.java
@@ -2,25 +2,29 @@
 
 import android.content.Context;
 import android.net.Uri;
+import android.view.View;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 
 import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
+import org.mozilla.vrbrowser.utils.ViewUtils;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.IntStream;
 
-public class VideoProjectionMenuWidget extends MenuWidget {
+public class VideoProjectionMenuWidget extends MenuWidget implements WidgetManagerDelegate.FocusChangeListener {
 
-    @IntDef(value = { VIDEO_PROJECTION_3D_SIDE_BY_SIDE, VIDEO_PROJECTION_360,
+    @IntDef(value = { VIDEO_PROJECTION_UNSUPPORTED, VIDEO_PROJECTION_3D_SIDE_BY_SIDE, VIDEO_PROJECTION_360,
                       VIDEO_PROJECTION_360_STEREO, VIDEO_PROJECTION_180,
                       VIDEO_PROJECTION_180_STEREO_LEFT_RIGHT, VIDEO_PROJECTION_180_STEREO_TOP_BOTTOM })
     public @interface VideoProjectionFlags {}
 
+    public static final int VIDEO_PROJECTION_UNSUPPORTED = -1;
     public static final int VIDEO_PROJECTION_3D_SIDE_BY_SIDE = 0;
     public static final int VIDEO_PROJECTION_360 = 1;
     public static final int VIDEO_PROJECTION_360_STEREO = 2;
@@ -61,6 +65,20 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.translationZ = 2.0f;
     }
 
+    @Override
+    public void show(@ShowFlags int aShowFlags) {
+        super.show(aShowFlags);
+
+        mWidgetManager.addFocusChangeListener(VideoProjectionMenuWidget.this);
+    }
+
+    @Override
+    public void hide(@HideFlags int aHideFlags) {
+        super.hide(aHideFlags);
+
+        mWidgetManager.removeFocusChangeListener(this);
+    }
+
     public void setParentWidget(UIWidget aParent) {
         mWidgetPlacement.parentHandle = aParent.getHandle();
     }
@@ -151,6 +169,14 @@ public void setSelectedProjection(@VideoProjectionFlags int aProjection) {
             return VIDEO_PROJECTION_3D_SIDE_BY_SIDE;
         }
 
-        return -1;
+        return VIDEO_PROJECTION_UNSUPPORTED;
+    }
+
+    @Override
+    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
+        if (!ViewUtils.isEqualOrChildrenOf(this, newFocus) && isVisible()) {
+            onDismiss();
+        }
     }
+
 }