Rebase and update to latest spec

MozillaReality · Apr 16, 2020 · a94ddbf · a94ddbf
1 parent 3801e86
commit a94ddbf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WebXRInterstitialWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WebXRInterstitialWidget.java
@@ -44,6 +44,7 @@ private void initialize() {
         mBinding = DataBindingUtil.inflate(inflater, R.layout.webxr_interstitial, this, true);
         mBinding.setLifecycleOwner((VRBrowserActivity)getContext());
         setHowToVisible(true);
+        setIsHardwareAccelerationEnabled(false);
 
         mSpinnerAnimation = (AnimatedVectorDrawable) mBinding.webxrSpinner.getDrawable();
         if (DeviceType.isPicoVR()) {
@@ -150,5 +151,6 @@ public void onExitWebXR() {
     public void onDismissWebXRInterstitial() {
         setHowToVisible(false);
         hideControllers();
+        mWidgetManager.updateWidget(this);
     }
 }
diff --git a/...ommon/shared/org/mozilla/vrbrowser/ui/widgets/menus/library/SortingContextMenuWidget.java b/...ommon/shared/org/mozilla/vrbrowser/ui/widgets/menus/library/SortingContextMenuWidget.java
@@ -81,7 +81,6 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.parentAnchorY = 1.0f;
         aPlacement.anchorX = 1.0f;
         aPlacement.anchorY = 1.0f;
-        aPlacement.opaque = false;
         aPlacement.cylinder = true;
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.context_menu_z_distance);
     }

diff --git a/app/src/main/res/layout/webxr_interstitial.xml b/app/src/main/res/layout/webxr_interstitial.xml
@@ -28,24 +28,13 @@
             android:scaleType="fitCenter"
             android:layout_gravity="center_horizontal"
             android:src="@drawable/webxr_spinner" />
-        <TextView
-            android:id="@+id/webxrHowtoExit"
-            tools:visibility="visible"
-            app:visibleGone="@{showHowTo}"
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:textSize="20sp"
-            android:background="@color/black"
-            android:text="@string/webxr_interstitial_how_to_exit"/>
 
         <TextView
             tools:visibility="visible"
             app:visibleGone="@{showHowTo}"
             android:layout_width="300dp"
             android:layout_height="wrap_content"
-            android:layout_below="@id/webxrHowtoExit"
-            android:layout_marginTop="30dp"
+            android:layout_centerInParent="true"
             android:textAlignment="center"
             android:textSize="20sp"
             android:background="@color/black"