Fix resize mode visible on top of settings

MozillaReality · Dec 18, 2018 · f20a93c · f20a93c
1 parent f4868c7
commit f20a93c
Show file tree

Hide file tree

Showing 4 changed files with 16 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
@@ -961,6 +961,11 @@ public void onPrivateBrowsingClicked() {
 
     }
 
+    @Override
+    public void onSettingsClicked() {
+        exitResizeMode(false);
+    }
+
     private void finishWidgetResize() {
         mWidgetManager.finishWidgetResize(mWindowWidget);
     }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayListener.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayListener.java
@@ -3,4 +3,5 @@
 public interface TrayListener {
     void onBookmarksClicked();
     void onPrivateBrowsingClicked();
+    void onSettingsClicked();
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
@@ -94,6 +94,7 @@ private void initialize(Context aContext) {
             }
 
             toggleSettingsDialog();
+            notifySettingsClicked();
             if (isDialogOpened(mSettingsDialogHandle))
                 view.requestFocusFromTouch();
         });
@@ -187,6 +188,10 @@ private void notifyPrivateBrowsingClicked() {
         mTrayListeners.forEach(trayListener -> trayListener.onPrivateBrowsingClicked());
     }
 
+    private void notifySettingsClicked() {
+        mTrayListeners.forEach(trayListener -> trayListener.onSettingsClicked());
+    }
+
     @Override
     protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         Context context = getContext();

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
@@ -649,6 +649,11 @@ public void onPrivateBrowsingClicked() {
         }
     }
 
+    @Override
+    public void onSettingsClicked() {
+
+    }
+
     // GeckoSession.ContentDelegate
     @Override
     public void onTitleChange(GeckoSession session, String title) {