Fix stripped texts in the app list.

Some languages have larger base font sizes, which strips texts
in the app list.

Bug: 765786
Change-Id: I489d7f31f80f54d79d47038b5a757d1672b4ffef
Reviewed-on: https://chromium-review.googlesource.com/671411
Commit-Queue: Jiaquan He <hejq@google.com>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502873}

ui/app_list/app_list_constants.cc

@@ -279,4 +279,22 @@ const gfx::ShadowValues& IconEndShadows() {
   return icon_shadows;
 }
 
+const gfx::FontList& FullscreenAppListAppTitleFont() {
+  // The max line height of app titles while the fullscreen launcher is enabled,
+  // which is determined by the sizes of app tile views, its paddings, and the
+  // icon.
+  constexpr int kFullscreenAppTitleMaxLineHeight = 16;
+
+  // The font for app titles while the fullscreen launcher is enabled. We're
+  // getting the largest font that doesn't exceed
+  // |kFullscreenAppTitleMaxLineHeight|.
+  // Note: we resize the font to 1px larger, otherwise it looks too small.
+  static const gfx::FontList kFullscreenAppListAppTitleFont =
+      ui::ResourceBundle::GetSharedInstance()
+          .GetFontList(ui::ResourceBundle::LargeFont)
+          .DeriveWithHeightUpperBound(kFullscreenAppTitleMaxLineHeight)
+          .DeriveWithSizeDelta(1);
+  return kFullscreenAppListAppTitleFont;
+}
+
 }  // namespace app_list

ui/app_list/app_list_constants.h

@@ -212,6 +212,8 @@ APP_LIST_EXPORT gfx::ShadowValue GetShadowForZHeight(int z_height);
 APP_LIST_EXPORT const gfx::ShadowValues& IconStartShadows();
 APP_LIST_EXPORT const gfx::ShadowValues& IconEndShadows();
 
+APP_LIST_EXPORT const gfx::FontList& FullscreenAppListAppTitleFont();
+
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_APP_LIST_CONSTANTS_H_

ui/app_list/views/app_list_item_view.cc

@@ -92,10 +92,9 @@ AppListItemView::AppListItemView(AppsGridView* apps_grid_view,
   title_->SetHandlesTooltips(false);
 
   if (is_fullscreen_app_list_enabled_) {
-    const gfx::FontList& base_font =
-        ui::ResourceBundle::GetSharedInstance().GetFontList(
-            ui::ResourceBundle::BaseFont);
-    title_->SetFontList(base_font.DeriveWithSizeDelta(1));
+    const gfx::FontList& font = FullscreenAppListAppTitleFont();
+    title_->SetFontList(font);
+    title_->SetLineHeight(font.GetHeight());
     title_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     title_->SetEnabledColor(kGridTitleColorFullscreen);
   } else {

ui/app_list/views/search_result_tile_item_view.cc

@@ -57,13 +57,11 @@ SearchResultTileItemView::SearchResultTileItemView(
   SetVisible(false);
 
   if (is_play_store_search_enabled) {
-    const gfx::FontList& base_font =
-        ui::ResourceBundle::GetSharedInstance().GetFontList(
-            ui::ResourceBundle::BaseFont);
-
+    const gfx::FontList& font = FullscreenAppListAppTitleFont();
     rating_ = new views::Label;
     rating_->SetEnabledColor(kSearchAppRatingColor);
-    rating_->SetFontList(base_font);
+    rating_->SetFontList(font);
+    rating_->SetLineHeight(font.GetHeight());
     rating_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
     rating_->SetVisible(false);
     AddChildView(rating_);
@@ -78,7 +76,8 @@ SearchResultTileItemView::SearchResultTileItemView(
 
     price_ = new views::Label;
     price_->SetEnabledColor(kSearchAppPriceColor);
-    price_->SetFontList(base_font);
+    price_->SetFontList(font);
+    price_->SetLineHeight(font.GetHeight());
     price_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     price_->SetVisible(false);
     AddChildView(price_);
@@ -115,14 +114,12 @@ void SearchResultTileItemView::SetSearchResult(SearchResult* item) {
   SetPrice(item_->formatted_price());
 
   if (is_fullscreen_app_list_enabled_) {
-    const gfx::FontList& base_font =
-        ui::ResourceBundle::GetSharedInstance().GetFontList(
-            ui::ResourceBundle::BaseFont);
-
+    const gfx::FontList& font = FullscreenAppListAppTitleFont();
     if (item_->display_type() == SearchResult::DISPLAY_RECOMMENDATION) {
       set_is_recommendation(true);
 
-      title()->SetFontList(base_font.DeriveWithSizeDelta(1));
+      title()->SetFontList(font);
+      title()->SetLineHeight(font.GetHeight());
       title()->SetEnabledColor(kGridTitleColorFullscreen);
     } else if (item_->display_type() == SearchResult::DISPLAY_TILE) {
       // Set solid color background to avoid broken text. See crbug.com/746563.
@@ -136,7 +133,8 @@ void SearchResultTileItemView::SetSearchResult(SearchResult* item) {
       }
       title()->SetBackground(
           views::CreateSolidBackground(kCardBackgroundColorFullscreen));
-      title()->SetFontList(base_font.DeriveWithSizeDelta(1));
+      title()->SetFontList(font);
+      title()->SetLineHeight(font.GetHeight());
       title()->SetEnabledColor(kSearchTitleColor);
     }