diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java index 1f9d8522c..fa87ae2ac 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java @@ -47,7 +47,6 @@ import org.mozilla.vrbrowser.ui.widgets.BookmarkListener; import org.mozilla.vrbrowser.ui.widgets.BookmarksWidget; import org.mozilla.vrbrowser.ui.widgets.BrowserWidget; -import org.mozilla.vrbrowser.ui.widgets.dialogs.CrashDialogWidget; import org.mozilla.vrbrowser.ui.widgets.KeyboardWidget; import org.mozilla.vrbrowser.ui.widgets.NavigationBarWidget; import org.mozilla.vrbrowser.ui.widgets.RootWidget; @@ -59,6 +58,7 @@ import org.mozilla.vrbrowser.ui.widgets.Widget; import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate; import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement; +import org.mozilla.vrbrowser.ui.widgets.dialogs.CrashDialogWidget; import java.io.IOException; import java.net.URISyntaxException; @@ -66,7 +66,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; -import java.util.function.Consumer; import androidx.annotation.Keep; import androidx.annotation.NonNull; @@ -210,8 +209,6 @@ protected void initializeWorld() { // Bookmarks panel mBookmarksWidget = new BookmarksWidget(this); - mBookmarksWidget.setBrowserWidget(mBrowserWidget); - mBrowserWidget.setBookmarksWidget(mBookmarksWidget); // Create Browser navigation widget mNavigationBar = new NavigationBarWidget(this); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BookmarksWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BookmarksWidget.java index 3e3c8d8cc..016a953c3 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BookmarksWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BookmarksWidget.java @@ -48,7 +48,6 @@ public class BookmarksWidget extends UIWidget implements Application.ActivityLif private BookmarksBinding mBinding; private BookmarkAdapter mBookmarkAdapter; private BookmarkListViewModel mBookmarkListModel; - private Widget mBrowserWidget; private List mBookmarkListeners; private AudioEngine mAudio; private int mSessionId; @@ -196,10 +195,6 @@ public void onChanged(List bookmarkEntities) { } }; - public void setBrowserWidget(Widget widget) { - mBrowserWidget = widget; - } - @Override public void show() { super.show(); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrowserWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrowserWidget.java index b4cb57fd4..7b3db25bf 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrowserWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrowserWidget.java @@ -45,7 +45,6 @@ public class BrowserWidget extends UIWidget implements SessionStore.SessionChang private int mWidthBackup; private int mHeightBackup; private int mBorderWidth; - private BookmarksWidget mBookmarksWidget; Runnable mFirstDrawCallback; private boolean mIsInVRVideoMode; @@ -109,10 +108,6 @@ public void hide(@HideFlags int aHideFlag) { clearFocus(); } - public void setBookmarksWidget(BookmarksWidget aWidget) { - mBookmarksWidget = aWidget; - } - public void pauseCompositor() { if (mDisplay == null) { return; @@ -167,7 +162,6 @@ public void disableVRVideoMode() { @Override public void resizeByMultiplier(float aspect, float multiplier) { - mMultiplier = multiplier; float worldWidth = WidgetPlacement.floatDimension(getContext(), R.dimen.window_world_width); float worldHeight = worldWidth / aspect; float area = worldWidth * worldHeight * multiplier;