Remove notifications when resizing and opening library panels (Mozill…

…aReality#2285)
lissyx · Jan 21, 2020 · 9c37fc0 · 9c37fc0
1 parent fa287e1
commit 9c37fc0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -286,7 +286,7 @@ protected void initializeWidgets() {
             public void onFocusedWindowChanged(@NonNull WindowWidget aFocusedWindow, @Nullable WindowWidget aPrevFocusedWindow) {
                 attachToWindow(aFocusedWindow, aPrevFocusedWindow);
                 mTray.setAddWindowVisible(mWindows.canOpenNewWindow());
-                mNavigationBar.hidePopUpsBlockedNotification();
+                mNavigationBar.hideNotifications();
             }
             @Override
             public void onWindowBorderChanged(@NonNull WindowWidget aChangeWindow) {
@@ -295,14 +295,14 @@ public void onWindowBorderChanged(@NonNull WindowWidget aChangeWindow) {
 
             @Override
             public void onWindowsMoved() {
-                mNavigationBar.hidePopUpsBlockedNotification();
+                mNavigationBar.hideNotifications();
                 updateWidget(mTray);
             }
 
             @Override
             public void onWindowClosed() {
                 mTray.setAddWindowVisible(mWindows.canOpenNewWindow());
-                mNavigationBar.hidePopUpsBlockedNotification();
+                mNavigationBar.hideNotifications();
                 updateWidget(mTray);
             }
 

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
@@ -609,6 +609,8 @@ private void enterResizeMode() {
             }
         }
 
+        hideNotifications();
+
         // Update preset styles
     }
 
@@ -1051,6 +1053,8 @@ public void onBookmarksShown(WindowWidget aWindow) {
             mURLBar.setHint(R.string.url_bookmarks_title);
             mURLBar.setIsLibraryVisible(true);
         }
+
+        hideNotifications();
     }
 
     @Override
@@ -1071,6 +1075,8 @@ public void onHistoryViewShown(WindowWidget aWindow) {
             mURLBar.setHint(R.string.url_history_title);
             mURLBar.setIsLibraryVisible(true);
         }
+
+        hideNotifications();
     }
 
     @Override
@@ -1226,6 +1232,10 @@ public void hidePopUpsBlockedNotification() {
         });
     }
 
+    public void hideNotifications() {
+        hidePopUpsBlockedNotification();
+    }
+
     private void showNotification(UIButton button, int stringRes) {
         if (mPopUpNotification != null && mPopUpNotification.isVisible()) {
             return;