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 cf4b81c34..770a03ea9 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
@@ -961,7 +961,7 @@ public void onPopUpButtonClicked() {
public void onWebXRButtonClicked() {
toggleQuickPermission(mBinding.navigationBarNavigation.urlBar.getWebxRButton(),
SitePermission.SITE_PERMISSION_WEBXR,
- !mViewModel.getIsWebXRBlocked().getValue().get());
+ mViewModel.getIsWebXRBlocked().getValue().get());
}
@Override
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/QuickPermissionWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/QuickPermissionWidget.java
index 0bc72d15d..922584c8c 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/QuickPermissionWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/QuickPermissionWidget.java
@@ -35,7 +35,7 @@ public QuickPermissionWidget(Context aContext) {
private void initialize() {
LayoutInflater inflater = LayoutInflater.from(getContext());
mBinding = DataBindingUtil.inflate(inflater, R.layout.quick_permission_dialog, this, true);
- mBinding.setBlocked(false);
+ mBinding.setBlockButtonVisible(false);
mBinding.allowButton.setOnClickListener(v -> {
if (mDelegate != null) {
mDelegate.onAllow();
@@ -52,20 +52,27 @@ private void initialize() {
public void setData(String uri, int aCategory, boolean aBlocked) {
mCategory = aCategory;
mDomain = uri;
- mBinding.setBlocked(aBlocked);
+ mBinding.setBlockButtonVisible(aBlocked);
updateUI();
}
public void updateUI() {
switch (mCategory) {
case SitePermission.SITE_PERMISSION_WEBXR: {
- mBinding.message.setText(getResources().getString(R.string.webxr_block_dialog_message, mDomain));
+ mBinding.message.setText(
+ getResources().getString(R.string.webxr_permission_dialog_message,
+ mBinding.getBlockButtonVisible() ?
+ getResources().getString(R.string.off).toUpperCase() :
+ getResources().getString(R.string.on).toUpperCase(),
+ getResources().getString(R.string.sumo_webxr_url)));
+ mBinding.allowButton.setText(R.string.permission_allow);
+ mBinding.blockButton.setText(R.string.pop_up_site_switch_block);
break;
}
case SitePermission.SITE_PERMISSION_TRACKING: {
mBinding.message.setText(
getResources().getString(R.string.tracking_dialog_message,
- mBinding.getBlocked() ?
+ mBinding.getBlockButtonVisible() ?
getResources().getString(R.string.on).toUpperCase() :
getResources().getString(R.string.off).toUpperCase(),
getResources().getString(R.string.sumo_etp_url)));
diff --git a/app/src/main/res/layout/quick_permission_dialog.xml b/app/src/main/res/layout/quick_permission_dialog.xml
index fa44da631..c79b857ad 100644
--- a/app/src/main/res/layout/quick_permission_dialog.xml
+++ b/app/src/main/res/layout/quick_permission_dialog.xml
@@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -50,7 +50,7 @@
android:text="@string/pop_up_site_switch_allow"
android:textColor="@drawable/dialog_button_text_color"
android:textStyle="bold"
- visibleGone="@{blocked}"/>
+ visibleGone="@{blockButtonVisible}"/>
+ visibleGone="@{!blockButtonVisible}"/>
https://support.mozilla.org/kb/use-firefox-another-language?as=u&utm_source=inproduct
https://support.mozilla.org/kb/choose-display-languages-multilingual-web-pages?as=u&utm_source=inproduct
https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop
+ https://support.mozilla.org/en-US/kb/webxr-permission-info-page
view
position
view_id
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d0c906c9..8cf5e7b48 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1453,7 +1453,7 @@ the Select` button. When clicked it closes all the previously selected tabs -->
- ā%1$sā wants to access WebXR API
+ WebXR is %1$s for this site. (<a href="%2$s">Learn More</a>)
Enhanced Tracking Protection is %1$s for this site. (<a href="%2$s">Learn More</a>)