Fix loading icon stuck on startup or pause/resume (#897)

MozillaReality · Dec 20, 2018 · 853b724 · 853b724
1 parent d32cabc
commit 853b724
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -259,13 +259,19 @@ protected void onPause() {
         }
         mAudioEngine.pauseEngine();
         SessionStore.get().setActive(false);
+        for (Widget widget: mWidgets.values()) {
+            widget.onPause();
+        }
         super.onPause();
     }
 
     @Override
     protected void onResume() {
         SessionStore.get().setActive(true);
         mAudioEngine.resumeEngine();
+        for (Widget widget: mWidgets.values()) {
+            widget.onResume();
+        }
         super.onResume();
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -166,6 +166,20 @@ private void initialize(Context aContext) {
         // Prevent the URL TextEdit to get focus when user touches something outside of it
         setFocusable(true);
         setClickable(true);
+        syncViews();
+    }
+
+    public void onPause() {
+        if (mIsLoading) {
+            mLoadingView.clearAnimation();
+        }
+    }
+
+    public void onResume() {
+        if (mIsLoading) {
+            mLoadingView.startAnimation(mLoadingAnimation);
+        }
+
     }
 
     public void setDelegate(NavigationURLBarDelegate delegate) {
@@ -340,6 +354,8 @@ private void syncViews() {
         }
         else {
             mURLLeftContainer.setVisibility(View.GONE);
+            mLoadingView.setVisibility(View.GONE);
+            mInsecureIcon.setVisibility(View.GONE);
         }
 
         mURL.setPadding(leftPadding, mURL.getPaddingTop(), mURL.getPaddingRight(), mURL.getPaddingBottom());

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
@@ -311,6 +311,18 @@ else if (SessionStore.get().canUnstackSession())
         handleSessionState();
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        mURLBar.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mURLBar.onResume();
+    }
+
     @Override
     public void releaseWidget() {
         mWidgetManager.removeUpdateListener(this);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java
@@ -81,6 +81,14 @@ private void initialize() {
         mBackHandler = () -> onDismiss();
     }
 
+    @Override
+    public void onPause() {
+    }
+
+    @Override
+    public void onResume() {
+    }
+
     @Override
     public void resizeByMultiplier(float aspect, float multiplier) {
         // To be implemented by inheriting widgets

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Widget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Widget.java
@@ -10,6 +10,8 @@
 import android.view.Surface;
 
 public interface Widget {
+    void onPause();
+    void onResume();
     void setSurfaceTexture(SurfaceTexture aTexture, final int aWidth, final int aHeight);
     void setSurface(Surface aSurface, final int aWidth, final int aHeight, Runnable aFirstDrawCallback);
     void resizeSurface(final int aWidth, final int aHeight);