Improve Window visibility in transitions (#2790)

MozillaReality · Feb 17, 2020 · ecaeed6 · ecaeed6
1 parent f8bdc7b
commit ecaeed6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -528,7 +528,7 @@ public void enterPrivateMode() {
             return;
         }
         mPrivateMode = true;
-        updateCurvedMode(true);
+
         if (mFocusedWindow != null) {
             mRegularWindowPlacement = mFocusedWindow.getWindowPlacement();
 
@@ -538,6 +538,10 @@ public void enterPrivateMode() {
         for (WindowWidget window: mRegularWindows) {
             setWindowVisible(window, false);
         }
+
+        updateViews();
+        updateCurvedMode(true);
+
         for (WindowWidget window: mPrivateWindows) {
             setWindowVisible(window, true);
         }
@@ -551,7 +555,7 @@ public void enterPrivateMode() {
         } else {
             focusWindow(getWindowWithPlacement(mPrivateWindowPlacement));
         }
-        updateViews();
+
         mWidgetManager.pushWorldBrightness(this, WidgetManagerDelegate.DEFAULT_DIM_BRIGHTNESS);
     }
 
@@ -560,7 +564,7 @@ public void exitPrivateMode() {
             return;
         }
         mPrivateMode = false;
-        updateCurvedMode(true);
+
         if (mFocusedWindow != null) {
             mPrivateWindowPlacement = mFocusedWindow.getWindowPlacement();
 
@@ -570,14 +574,18 @@ public void exitPrivateMode() {
         for (WindowWidget window: mPrivateWindows) {
             setWindowVisible(window, false);
         }
+
+        updateViews();
+        updateCurvedMode(true);
+
         for (WindowWidget window: mRegularWindows) {
             setWindowVisible(window, true);
         }
         WindowWidget window = getWindowWithPlacement(mRegularWindowPlacement);
         if (window != null) {
             focusWindow(window);
         }
-        updateViews();
+
         mWidgetManager.popWorldBrightness(this);
     }
 

diff --git a/app/src/main/res/layout/top_bar.xml b/app/src/main/res/layout/top_bar.xml
@@ -13,7 +13,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:gravity="center_horizontal">
+        android:gravity="center_horizontal"
+        app:visibleGone="@{viewmodel.isWindowVisible}">
 
         <FrameLayout
             android:layout_width="45dp"