From 0ae49d89ebdfffd2b054ce1d08981b9dd24bcb28 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 31 Jul 2019 23:52:19 +0200
Subject: [PATCH 1/2] Fixed stop navigation button tooltip

---
 .../org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java | 2 ++
 app/src/main/res/values/strings.xml                           | 4 ++++
 2 files changed, 6 insertions(+)

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
index c1eb86500..10b87075b 100644
--- 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
index b31605269..a100693b0 100644
--- 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>

From cf76a46d03b3ff533ec38189b68ca858a3889c45 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Thu, 1 Aug 2019 09:22:52 +0200
Subject: [PATCH 2/2] Refresh tooltip button if text is updated

---
 .../common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java | 3 +++
 1 file changed, 3 insertions(+)

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
index 31937bfd9..88ba1f7f3 100644
--- 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