Commit 4042cda0 authored by Ian Vollick's avatar Ian Vollick Committed by Commit Bot

[vr] Hide content at unsupported feature prompt

Previously this UI would be overlaid atop the content quad, making it
quite hard to read.

Bug: 820261
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ib44d055e1774bdbb86c9a18f92d1fbe1d6e17bbb
Reviewed-on: https://chromium-review.googlesource.com/956504
Commit-Queue: Ian Vollick <vollick@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542001}
parent 4cf98285
...@@ -65,6 +65,7 @@ static const char* g_ui_element_name_strings[] = { ...@@ -65,6 +65,7 @@ static const char* g_ui_element_name_strings[] = {
"kOmniboxOuterLayoutSpacer", "kOmniboxOuterLayoutSpacer",
"kOmniboxShadow", "kOmniboxShadow",
"k2dBrowsingVisibiltyControlForVoice", "k2dBrowsingVisibiltyControlForVoice",
"k2dBrowsingVisibilityControlForPrompt",
"k2dBrowsingVisibiltyControlForSiteInfoPrompt", "k2dBrowsingVisibiltyControlForSiteInfoPrompt",
"k2dBrowsingOpacityControlForAudioPermissionPrompt", "k2dBrowsingOpacityControlForAudioPermissionPrompt",
"k2dBrowsingOpacityControlForNativeDialogPrompt", "k2dBrowsingOpacityControlForNativeDialogPrompt",
......
...@@ -64,6 +64,7 @@ enum UiElementName { ...@@ -64,6 +64,7 @@ enum UiElementName {
kOmniboxOuterLayoutSpacer, kOmniboxOuterLayoutSpacer,
kOmniboxShadow, kOmniboxShadow,
k2dBrowsingVisibiltyControlForVoice, k2dBrowsingVisibiltyControlForVoice,
k2dBrowsingVisibilityControlForPrompt,
k2dBrowsingVisibiltyControlForSiteInfoPrompt, k2dBrowsingVisibiltyControlForSiteInfoPrompt,
k2dBrowsingOpacityControlForAudioPermissionPrompt, k2dBrowsingOpacityControlForAudioPermissionPrompt,
k2dBrowsingOpacityControlForNativeDialogPrompt, k2dBrowsingOpacityControlForNativeDialogPrompt,
......
...@@ -201,6 +201,10 @@ void VrTestContext::HandleInput(ui::Event* event) { ...@@ -201,6 +201,10 @@ void VrTestContext::HandleInput(ui::Event* event) {
case ui::DomCode::US_X: case ui::DomCode::US_X:
ui_->OnAppButtonClicked(); ui_->OnAppButtonClicked();
break; break;
case ui::DomCode::US_Q:
model_->active_modal_prompt_type =
kModalPromptTypeGenericUnsupportedFeature;
break;
default: default:
break; break;
} }
......
...@@ -720,12 +720,23 @@ void UiSceneCreator::Create2dBrowsingSubtreeRoots() { ...@@ -720,12 +720,23 @@ void UiSceneCreator::Create2dBrowsingSubtreeRoots() {
element = Create<UiElement>(k2dBrowsingVisibiltyControlForVoice, kPhaseNone); element = Create<UiElement>(k2dBrowsingVisibiltyControlForVoice, kPhaseNone);
scene_->AddUiElement(k2dBrowsingRepositioner, std::move(element)); scene_->AddUiElement(k2dBrowsingRepositioner, std::move(element));
element =
Create<UiElement>(k2dBrowsingVisibilityControlForPrompt, kPhaseNone);
VR_BIND_VISIBILITY(
element,
model->active_modal_prompt_type == kModalPromptTypeNone ||
model->active_modal_prompt_type ==
kModalPromptTypeExitVRForVoiceSearchRecordAudioOsPermission ||
model->active_modal_prompt_type == kModalPromptTypeUpdateKeyboard);
scene_->AddUiElement(k2dBrowsingVisibiltyControlForVoice, std::move(element));
element = Create<UiElement>(k2dBrowsingVisibiltyControlForSiteInfoPrompt, element = Create<UiElement>(k2dBrowsingVisibiltyControlForSiteInfoPrompt,
kPhaseNone); kPhaseNone);
VR_BIND_VISIBILITY(element, model->active_modal_prompt_type != VR_BIND_VISIBILITY(element, model->active_modal_prompt_type !=
kModalPromptTypeExitVRForSiteInfo); kModalPromptTypeExitVRForSiteInfo);
scene_->AddUiElement(k2dBrowsingVisibiltyControlForVoice, std::move(element)); scene_->AddUiElement(k2dBrowsingVisibilityControlForPrompt,
std::move(element));
element = Create<UiElement>(k2dBrowsingOpacityControlForAudioPermissionPrompt, element = Create<UiElement>(k2dBrowsingOpacityControlForAudioPermissionPrompt,
kPhaseNone); kPhaseNone);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment