Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Fixed stop navigation button tooltip #1480

Merged
bluemarvin merged 2 commits into from
Aug 1, 2019
Merged

Fixed stop navigation button tooltip #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ae49d8
Fixed stop navigation button tooltip
keianhzo Jul 31, 2019
cf76a46
Refresh tooltip button if text is updated
keianhzo Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ public void setTooltip(String text) {
mTooltipText = text;
else
setTooltipText(text);

if (mTooltipView != null && mTooltipView.isVisible())
mTooltipView.setText(text);
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand All @@ -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));
}
}

Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down