Skip to content

GitLab

T
tangled
Commit 1de134a4 authored by David Black's avatar David Black Committed by Commit Bot
Browse files
Options

Made UI tweaks. 

Per instructions in bugs, updated:
- Settings/reminders text.
- Mini UI padding/typography.

Bug: b:112311203, b:112312304
Change-Id: If9b0041043fb7f9a716173260cc798a52e5adac8
Reviewed-on: https://chromium-review.googlesource.com/1165950Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#581353}
parent fc0acfb3
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
ash/assistant/ui/assistant_mini_view.cc
View file @ 1de134a4
...@@ -24,7 +24,10 @@ namespace { ...@@ -24,7 +24,10 @@ namespace {
// Appearance. // Appearance.
constexpr int kIconSizeDip = 20; constexpr int kIconSizeDip = 20;
constexpr int kLineHeightDip = 20;
constexpr int kMaxWidthDip = 512; constexpr int kMaxWidthDip = 512;
constexpr int kPaddingLeftDip = 14;
constexpr int kPaddingRightDip = 24;
constexpr int kPreferredHeightDip = 48; constexpr int kPreferredHeightDip = 48;
} // namespace } // namespace
...@@ -62,7 +65,8 @@ void AssistantMiniView::InitLayout() { ...@@ -62,7 +65,8 @@ void AssistantMiniView::InitLayout() {
views::BoxLayout* layout_manager = views::BoxLayout* layout_manager =
SetLayoutManager(std::make_unique<views::BoxLayout>( SetLayoutManager(std::make_unique<views::BoxLayout>(
views::BoxLayout::Orientation::kHorizontal, views::BoxLayout::Orientation::kHorizontal,
gfx::Insets(0, kPaddingDip), 2 * kSpacingDip)); gfx::Insets(0, kPaddingLeftDip, 0, kPaddingRightDip),
2 * kSpacingDip));
layout_manager->set_cross_axis_alignment( layout_manager->set_cross_axis_alignment(
views::BoxLayout::CrossAxisAlignment::CROSS_AXIS_ALIGNMENT_CENTER); views::BoxLayout::CrossAxisAlignment::CROSS_AXIS_ALIGNMENT_CENTER);
...@@ -76,9 +80,11 @@ void AssistantMiniView::InitLayout() { ...@@ -76,9 +80,11 @@ void AssistantMiniView::InitLayout() {
// Label. // Label.
label_->SetAutoColorReadabilityEnabled(false); label_->SetAutoColorReadabilityEnabled(false);
label_->SetEnabledColor(kTextColorPrimary);
label_->SetFontList( label_->SetFontList(
assistant::ui::GetDefaultFontList().DeriveWithSizeDelta(4)); assistant::ui::GetDefaultFontList().DeriveWithSizeDelta(1));
label_->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT); label_->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT);
label_->SetLineHeight(kLineHeightDip);
AddChildView(label_); AddChildView(label_);
// Trigger input modality changed event to initialize view state. // Trigger input modality changed event to initialize view state.
......
ash/assistant/util/deep_link_util.cc
View file @ 1de134a4
...@@ -40,8 +40,8 @@ constexpr char kAssistantExploreWebUrl[] = ...@@ -40,8 +40,8 @@ constexpr char kAssistantExploreWebUrl[] =
constexpr char kAssistantRemindersWebUrl[] = R"(data:text/html, constexpr char kAssistantRemindersWebUrl[] = R"(data:text/html,
<html> <html>
<body style="font-family:Google Sans,sans-serif;padding:0 32px;"> <body style="font-family:Google Sans,sans-serif;padding:0 32px;">
<h3>Assistant Reminders</h3> <h3>Google Assistant Reminders</h3>
<p>Coming soon. Meanwhile, please use your Android/iOS phone to access reminders.</p> <p>Please use your phone to access Reminders.</p>
</body> </body>
</html> </html>
)"; )";
...@@ -50,8 +50,8 @@ constexpr char kAssistantRemindersWebUrl[] = R"(data:text/html, ...@@ -50,8 +50,8 @@ constexpr char kAssistantRemindersWebUrl[] = R"(data:text/html,
constexpr char kAssistantSettingsWebUrl[] = R"(data:text/html, constexpr char kAssistantSettingsWebUrl[] = R"(data:text/html,
<html> <html>
<body style="font-family:Google Sans,sans-serif;padding:0 32px;"> <body style="font-family:Google Sans,sans-serif;padding:0 32px;">
<h3>Assistant Settings</h3> <h3>Google Assistant Settings</h3>
<p>Coming soon. Meanwhile, please use your Android/iOS phone to access settings.</p> <p>Please use your phone to access Settings.</p>
</body> </body>
</html> </html>
)"; )";
......
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