Rebase fixes

MozillaReality · Aug 2, 2019 · bec24ba · bec24ba
1 parent cfd4b2e
commit bec24ba
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 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
@@ -540,14 +540,8 @@ private void exitResizeMode(ResizeAction aResizeAction) {
             return;
         }
         if (aResizeAction == ResizeAction.RESTORE_SIZE) {
-<<<<<<< HEAD
-            mWindowWidget.getPlacement().copyFrom(mPlacementBeforeResize);
-            mWidgetManager.updateWidget(mWindowWidget);
-            mWindowWidget.saveCurrentSize();
-=======
             mAttachedWindow.getPlacement().copyFrom(mPlacementBeforeResize);
             mWidgetManager.updateWidget(mAttachedWindow);
->>>>>>> Rebase fixes
         }
         mIsResizing = false;
         finishWidgetResize();

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
@@ -709,12 +709,6 @@ public void setNoInternetToastVisible(boolean aVisible) {
         }
     }
 
-    public void saveCurrentSize() {
-        final float aspect = (float)mWidgetPlacement.width / (float)mWidgetPlacement.height;
-        SettingsStore.getInstance(getContext()).setBrowserWorldWidth(mWidgetPlacement.worldWidth);
-        SettingsStore.getInstance(getContext()).setBrowserWorldHeight(mWidgetPlacement.worldWidth / aspect);
-    }
-
     public void showAlert(String title, @NonNull String msg, @NonNull AlertCallback callback) {
         mAlertPrompt = new AlertPromptWidget(getContext());
         mAlertPrompt.mWidgetPlacement.parentHandle = getHandle();