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

Fixed button order in confirm prompt #1403

Merged
merged 2 commits into from
Jul 16, 2019
Merged

Fixed button order in confirm prompt #1403

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
0706065
Fixed button order in confirm prompt
keianhzo Jul 16, 2019
42160bc
Removed outdated comment
keianhzo Jul 16, 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
1 change: 0 additions & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@ public boolean onGenericMotionEvent(MotionEvent aEvent) {
}

private void setPrivateBrowsingEnabled(boolean isEnabled) {
// TODO: Fade in/out the browser window. Waiting for https://github.com/MozillaReality/FirefoxReality/issues/77
}

public void setNoInternetToastVisible(boolean aVisible) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ConfirmPromptWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void setButtons(String[] btnMsg) {
// Returning 0 should be Ok but is in fact Cancel.
if (btnMsg[POSITIVE] != null) {
mButtons[POSITIVE].setText(btnMsg[POSITIVE]);
mButtons[POSITIVE].setTag(NEGATIVE);
mButtons[POSITIVE].setTag(POSITIVE);
mButtons[POSITIVE].setVisibility(VISIBLE);
}
if (btnMsg[NEUTRAL] != null) {
Expand All @@ -106,7 +106,7 @@ public void setButtons(String[] btnMsg) {
}
if (btnMsg[NEGATIVE] != null) {
mButtons[NEGATIVE].setText(btnMsg[NEGATIVE]);
mButtons[NEGATIVE].setTag(POSITIVE);
mButtons[NEGATIVE].setTag(NEGATIVE);
mButtons[NEGATIVE].setVisibility(VISIBLE);
}
}
Expand Down