UI polish for Assistant.

Fixes two UI issues: 1. "Nothing found on screen" card was still being clipped despite using border-box box-sizing. Because the border is 1px wide, this is probably caused by pixel rounding when we size our WebView. To work around this we will just add a slight margin to the card to ensure the border is drawn within WebView bounds. 2. When changing screen resolution with the UI open, multiline labels would sometimes not be bounded correctly. To address this, we make sure that the Label width matches parent width. We accomplish this by using STRETCH cross axis alignment on the box layout (which is default cross axis alignment). Bug: b:116001082, b:115585763 Change-Id: Iec80955e45011d73816978c43ddf1235e49b476d Reviewed-on: https://chromium-review.googlesource.com/1241470 Commit-Queue: David Black <dmblack@google.com> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org> Cr-Commit-Position: refs/heads/master@{#593744}

UI polish for Assistant.
Fixes two UI issues: 1. "Nothing found on screen" card was still being clipped despite using border-box box-sizing. Because the border is 1px wide, this is probably caused by pixel rounding when we size our WebView. To work around this we will just add a slight margin to the card to ensure the border is drawn within WebView bounds. 2. When changing screen resolution with the UI open, multiline labels would sometimes not be bounded correctly. To address this, we make sure that the Label width matches parent width. We accomplish this by using STRETCH cross axis alignment on the box layout (which is default cross axis alignment). Bug: b:116001082, b:115585763 Change-Id: Iec80955e45011d73816978c43ddf1235e49b476d Reviewed-on: https://chromium-review.googlesource.com/1241470 Commit-Queue: David Black <dmblack@google.com> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org> Cr-Commit-Position: refs/heads/master@{#593744}
74dcc581 · David Black · Commit Bot · cd312e01 · 74dcc581 · 74dcc581
Commit 74dcc581 authored Sep 24, 2018 by David Black Committed by Commit Bot Sep 24, 2018
2 changed files
--- a/ash/assistant/ui/main_stage/ui_element_container_view.cc
+++ b/ash/assistant/ui/main_stage/ui_element_container_view.cc
@@ -258,15 +258,11 @@ void UiElementContainerView::PreferredSizeChanged() {
 }

 void UiElementContainerView::InitLayout() {
-  views::BoxLayout* layout_manager =
-      content_view()->SetLayoutManager(std::make_unique<views::BoxLayout>(
-          views::BoxLayout::Orientation::kVertical,
-          gfx::Insets(0, kPaddingHorizontalDip, kPaddingBottomDip,
-                      kPaddingHorizontalDip),
-          kSpacingDip));
-
-  layout_manager->set_cross_axis_alignment(
-      views::BoxLayout::CrossAxisAlignment::CROSS_AXIS_ALIGNMENT_START);
+  content_view()->SetLayoutManager(std::make_unique<views::BoxLayout>(
+      views::BoxLayout::Orientation::kVertical,
+      gfx::Insets(0, kPaddingHorizontalDip, kPaddingBottomDip,
+                  kPaddingHorizontalDip),
+      kSpacingDip));
 }

 void UiElementContainerView::OnCommittedQueryChanged(

--- a/chromeos/services/assistant/assistant_manager_service_impl.cc
+++ b/chromeos/services/assistant/assistant_manager_service_impl.cc
@@ -353,7 +353,6 @@ void AssistantManagerServiceImpl::OnShowContextualQueryFallback() {
         <body>
           <style>
             * {
-               box-sizing: border-box;
               cursor: default;
               font-family: Google Sans, sans-serif;
               user-select: none;
@@ -364,6 +363,7 @@ void AssistantManagerServiceImpl::OnShowContextualQueryFallback() {
               border-radius: 12px;
               color: #5F6368;
               font-size: 13px;
+               margin: 1px;
               padding: 16px;
               text-align: center;
             }