Fixes #3607 Fixes #3606 What's new fixes (#3614)

* Update viewmodel size when placement is updates * Request focus when what's new is clicked
MozillaReality · Jul 6, 2020 · ccc192f · ccc192f
1 parent 07a9c9a
commit ccc192f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
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
@@ -263,6 +263,7 @@ private void updateUI() {
         });
 
         mBinding.navigationBarNavigation.whatsNew.setOnClickListener(v -> {
+            v.requestFocusFromTouch();
             SettingsStore.getInstance(getContext()).setRemotePropsVersionName(BuildConfig.VERSION_NAME);
             RemoteProperties props = mSettingsViewModel.getProps().getValue().get(BuildConfig.VERSION_NAME);
             if (props != null) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -672,6 +672,8 @@ public void setWindowPlacement(@NonNull Windows.WindowPlacement aPlacement) {
             GleanMetricsService.activePlacementEvent(mWindowPlacement.getValue(), false);
         }
         mWindowPlacement = aPlacement;
+        mViewModel.setWidth(mWidgetPlacement.width);
+        mViewModel.setHeight(mWidgetPlacement.height);
         mViewModel.setPlacement(mWindowPlacement);
         if (mActive) {
             TelemetryWrapper.activePlacementEvent(mWindowPlacement.getValue(), true);
@@ -943,6 +945,8 @@ public void restoreBeforeFullscreenPlacement() {
         mWindowPlacement = mWindowPlacementBeforeFullscreen;
         mWidgetPlacement.copyFrom(mPlacementBeforeFullscreen);
         mWidgetPlacement.composited = composited;
+        mViewModel.setWidth(mWidgetPlacement.width);
+        mViewModel.setHeight(mWidgetPlacement.height);
     }
 
     public WidgetPlacement getBeforeFullscreenPlacement() {
@@ -955,6 +959,8 @@ public void saveBeforeResizePlacement() {
 
     public void restoreBeforeResizePlacement() {
         mWidgetPlacement.copyFrom(mPlacementBeforeResize);
+        mViewModel.setWidth(mWidgetPlacement.width);
+        mViewModel.setHeight(mWidgetPlacement.height);
     }
 
     public WidgetPlacement getBeforeResizePlacement() {