Commit c94f1893 authored by David Black's avatar David Black Committed by Commit Bot

Enable Assistant motion spec.

Enables the current motion spec implementation.
Also fixed a painting bug.

Follow up CL will remove the bool and dead code once these changes have
been more heavily tested in the wild.

Bug: b:112329634, b:112330123
Change-Id: Ibc6cf664d96125b6ca0fd322bde560f69a611f26
Reviewed-on: https://chromium-review.googlesource.com/1166293Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#581426}
parent 9fd5ad7e
...@@ -32,7 +32,7 @@ namespace ui { ...@@ -32,7 +32,7 @@ namespace ui {
// TODO(dmblack): Remove when enabling. This is used to gate aspects of the // TODO(dmblack): Remove when enabling. This is used to gate aspects of the
// motion spec which are being developed in pieces which should be enabled // motion spec which are being developed in pieces which should be enabled
// together. // together.
constexpr bool kIsMotionSpecEnabled = false; constexpr bool kIsMotionSpecEnabled = true;
// Returns the default font list for Assistant UI. // Returns the default font list for Assistant UI.
const gfx::FontList& GetDefaultFontList(); const gfx::FontList& GetDefaultFontList();
......
...@@ -602,8 +602,8 @@ void AssistantMainStage::UpdateTopPadding() { ...@@ -602,8 +602,8 @@ void AssistantMainStage::UpdateTopPadding() {
views::CreateEmptyBorder(top_padding, 0, 0, 0)); views::CreateEmptyBorder(top_padding, 0, 0, 0));
// Force a layout/paint pass. // Force a layout/paint pass.
content_layout_container_->Layout(); ui_element_container_->Layout();
content_layout_container_->SchedulePaint(); ui_element_container_->SchedulePaint();
// Apply top padding to the overlay layout container by applying an empty // Apply top padding to the overlay layout container by applying an empty
// border to its children. // border to its children.
......
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