Fixed stop navigation button tooltip (#1480)

* Fixed stop navigation button tooltip * Refresh tooltip button if text is updated
MozillaReality · Aug 1, 2019 · 3d484cb · 3d484cb
1 parent 6c48e63
commit 3d484cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
@@ -88,6 +88,9 @@ public void setTooltip(String text) {
             mTooltipText = text;
         else
             setTooltipText(text);
+
+        if (mTooltipView != null && mTooltipView.isVisible())
+            mTooltipView.setText(text);
     }
 
     @Override

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
@@ -706,6 +706,7 @@ public void onPageStart(GeckoSession aSession, String aUri) {
         mURLBar.setIsLoading(true);
         if (mReloadButton != null) {
             mReloadButton.setImageResource(R.drawable.ic_icon_exit);
+            mReloadButton.setTooltip(getResources().getString(R.string.stop_tooltip));
         }
     }
 
@@ -715,6 +716,7 @@ public void onPageStop(GeckoSession aSession, boolean b) {
         mURLBar.setIsLoading(false);
         if (mReloadButton != null) {
             mReloadButton.setImageResource(R.drawable.ic_icon_reload);
+            mReloadButton.setTooltip(getResources().getString(R.string.refresh_tooltip));
         }
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -646,6 +646,10 @@
          'Refresh' refers to reloading the current page. -->
     <string name="refresh_tooltip">Refresh</string>
 
+    <!-- This string is for the tooltip that appears upon hovering the 'Stop' button in the browser's navigation bar.
+         'Stop' stops the current page load. -->
+    <string name="stop_tooltip">Stop Loading</string>
+
     <!-- This string is for the tooltip that appears upon hovering the 'Home' button in the browser's navigation bar.
          'Home' refers to the browser's start page (e.g., the Firefox Reality Home Page). -->
     <string name="home_tooltip">Home</string>