Commit 0d45c159 authored by Weidong Guo's avatar Weidong Guo Committed by Commit Bot

Modify app title font

Changes:
Use Roboto-regular, 13px font size, 20px line height for the app title.

Demo: https://drive.google.com/open?id=10sYR2tFWezxuUYp-IpKoozHIZtMS4u-q

Bug: 869349
Change-Id: Ic5b14b3cf1df9aeaab722d04d59720c3184d731b
Reviewed-on: https://chromium-review.googlesource.com/1174898
Commit-Queue: Weidong Guo <weidongg@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584106}
parent c1141f37
...@@ -157,9 +157,8 @@ AppListItemView::AppListItemView(AppsGridView* apps_grid_view, ...@@ -157,9 +157,8 @@ AppListItemView::AppListItemView(AppsGridView* apps_grid_view,
title_->SetBackgroundColor(SK_ColorTRANSPARENT); title_->SetBackgroundColor(SK_ColorTRANSPARENT);
title_->SetAutoColorReadabilityEnabled(false); title_->SetAutoColorReadabilityEnabled(false);
title_->SetHandlesTooltips(false); title_->SetHandlesTooltips(false);
const gfx::FontList& font = AppListConfig::instance().app_title_font(); title_->SetFontList(AppListConfig::instance().app_title_font());
title_->SetFontList(font); title_->SetLineHeight(AppListConfig::instance().app_title_max_line_height());
title_->SetLineHeight(font.GetHeight());
title_->SetHorizontalAlignment(gfx::ALIGN_CENTER); title_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
title_->SetEnabledColor(apps_grid_view_->is_in_folder() title_->SetEnabledColor(apps_grid_view_->is_in_folder()
? kFolderGridTitleColor ? kFolderGridTitleColor
......
...@@ -35,9 +35,8 @@ TopIconAnimationView::TopIconAnimationView(const gfx::ImageSkia& icon, ...@@ -35,9 +35,8 @@ TopIconAnimationView::TopIconAnimationView(const gfx::ImageSkia& icon,
title_->SetBackgroundColor(SK_ColorTRANSPARENT); title_->SetBackgroundColor(SK_ColorTRANSPARENT);
title_->SetAutoColorReadabilityEnabled(false); title_->SetAutoColorReadabilityEnabled(false);
title_->SetHandlesTooltips(false); title_->SetHandlesTooltips(false);
const gfx::FontList& font = AppListConfig::instance().app_title_font(); title_->SetFontList(AppListConfig::instance().app_title_font());
title_->SetFontList(font); title_->SetLineHeight(AppListConfig::instance().app_title_max_line_height());
title_->SetLineHeight(font.GetHeight());
title_->SetHorizontalAlignment(gfx::ALIGN_CENTER); title_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
title_->SetEnabledColor(SK_ColorBLACK); title_->SetEnabledColor(SK_ColorBLACK);
title_->SetText(title); title_->SetText(title);
......
...@@ -66,9 +66,7 @@ AppListConfig::AppListConfig() ...@@ -66,9 +66,7 @@ AppListConfig::AppListConfig()
grid_focus_corner_radius_ = 12; grid_focus_corner_radius_ = 12;
app_title_max_line_height_ = 20; app_title_max_line_height_ = 20;
app_title_font_ = app_title_font_ =
ui::ResourceBundle::GetSharedInstance() ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(1);
.GetFontList(ui::ResourceBundle::LargeFont)
.DeriveWithHeightUpperBound(app_title_max_line_height_);
peeking_app_list_height_ = 284; peeking_app_list_height_ = 284;
search_box_closed_top_padding_ = 0; search_box_closed_top_padding_ = 0;
search_box_peeking_top_padding_ = 84; search_box_peeking_top_padding_ = 84;
......
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