Correctly hide controller on autoselected VR video playback (#1023)

MozillaReality · Mar 15, 2019 · dcbc58f · dcbc58f
1 parent ab033b4
commit dcbc58f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
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
@@ -494,6 +494,7 @@ private void enterVRVideo(@VideoProjectionMenuWidget.VideoProjectionFlags int aP
         }
         mIsInVRVideo = true;
         mWidgetManager.pushBackHandler(mVRVideoBackHandler);
+        mProjectionMenu.setSelectedProjection(aProjection);
         // Backup the placement because the same widget is reused in FullScreen & MediaControl menus
         mProjectionMenuPlacement.copyFrom(mProjectionMenu.getPlacement());
 
@@ -512,7 +513,7 @@ private void enterVRVideo(@VideoProjectionMenuWidget.VideoProjectionFlags int aP
         mWindowWidget.setVisible(false);
 
         closeFloatingMenus();
-        if (mProjectionMenu.getSelectedProjection() != VideoProjectionMenuWidget.VIDEO_PROJECTION_3D_SIDE_BY_SIDE) {
+        if (aProjection != VideoProjectionMenuWidget.VIDEO_PROJECTION_3D_SIDE_BY_SIDE) {
             mWidgetManager.setControllersVisible(false);
         }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/VideoProjectionMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/VideoProjectionMenuWidget.java
@@ -120,6 +120,10 @@ private void handleClick(@VideoProjectionFlags int aVideoProjection) {
         return mSelectedProjection;
     }
 
+    public void setSelectedProjection(@VideoProjectionFlags int aProjection) {
+        mSelectedProjection = aProjection;
+    }
+
     public static @VideoProjectionFlags Integer getAutomaticProjection(String aURL, AtomicBoolean autoEnter) {
         if (aURL == null) {
             return null;