Commit 88561680 authored by Tetsui Ohkubo's avatar Tetsui Ohkubo Committed by Commit Bot

Unified: Update help icon and adjust font size.

This CL makes following changes:
* Increase the font size of a detailed view header.
* Use medium style for Sign Out and Clear All buttons.
* Replace help icons used for a11y detailed view header.

TEST=manual
BUG=863618,858947

Change-Id: I05f831247c19ceda004acb9c1103b1716503f254
Reviewed-on: https://chromium-review.googlesource.com/1141671Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Reviewed-by: default avatarYoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577393}
parent ee0f7bb8
......@@ -67,7 +67,8 @@ TriView* SystemTrayItemDetailedViewDelegate::CreateTitleRow(int string_id) {
auto* label = TrayPopupUtils::CreateDefaultLabel();
label->SetText(l10n_util::GetStringUTF16(string_id));
TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE);
TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE,
false /* use_unified_theme */);
style.SetupLabel(label);
tri_view->AddView(TriView::Container::CENTER, label);
......
......@@ -85,7 +85,8 @@ void TrayPopupItemStyle::SetupLabel(views::Label* label) const {
const gfx::FontList& base_font_list = views::Label::GetDefaultFontList();
switch (font_style_) {
case FontStyle::TITLE:
label->SetFontList(base_font_list.Derive(1, gfx::Font::NORMAL,
label->SetFontList(base_font_list.Derive(use_unified_theme_ ? 8 : 1,
gfx::Font::NORMAL,
gfx::Font::Weight::MEDIUM));
break;
case FontStyle::DEFAULT_VIEW_LABEL:
......
......@@ -26,6 +26,8 @@ RoundedLabelButton::RoundedLabelButton(views::ButtonListener* listener,
SetHorizontalAlignment(gfx::ALIGN_CENTER);
SetBorder(views::CreateEmptyBorder(gfx::Insets()));
label()->SetSubpixelRenderingEnabled(false);
label()->SetFontList(views::Label::GetDefaultFontList().Derive(
1, gfx::Font::NORMAL, gfx::Font::Weight::MEDIUM));
TrayPopupUtils::ConfigureTrayPopupButton(this);
}
......
......@@ -13,6 +13,7 @@
#include "ash/system/unified/collapse_button.h"
#include "ash/system/unified/top_shortcut_button.h"
#include "ash/system/unified/unified_system_tray_controller.h"
#include "components/vector_icons/vector_icons.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icon_types.h"
......@@ -124,7 +125,8 @@ TriView* UnifiedDetailedViewDelegate::CreateTitleRow(int string_id) {
auto* label = TrayPopupUtils::CreateDefaultLabel();
label->SetText(l10n_util::GetStringUTF16(string_id));
TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE);
TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE,
true /* use_unified_theme */);
style.SetupLabel(label);
tri_view->AddView(TriView::Container::CENTER, label);
......@@ -205,7 +207,7 @@ views::Button* UnifiedDetailedViewDelegate::CreateSettingsButton(
views::Button* UnifiedDetailedViewDelegate::CreateHelpButton(
views::ButtonListener* listener) {
auto* button = new TopShortcutButton(listener, kSystemMenuHelpIcon,
auto* button = new TopShortcutButton(listener, vector_icons::kHelpOutlineIcon,
IDS_ASH_STATUS_TRAY_HELP);
// Help opens a web page, so treat it like Web UI settings.
if (!TrayPopupUtils::CanOpenWebUISettings())
......
......@@ -31,3 +31,33 @@ R_H_LINE_TO, 2,
R_CUBIC_TO, 0, -2.25f, 3, -2.5f, 3, -5,
R_CUBIC_TO, 0, -2.21f, -1.79f, -4, -4, -4,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 10, 2,
R_CUBIC_TO, 4.42f, 0, 8, 3.58f, 8, 8,
R_CUBIC_TO, 0, 4.42f, -3.58f, 8, -8, 8,
R_CUBIC_TO, -4.42f, 0, -8, -3.58f, -8, -8,
R_CUBIC_TO, 0, -4.42f, 3.58f, -8, 8, -8,
CLOSE,
R_MOVE_TO, 0, 14,
R_CUBIC_TO, 3.31f, 0, 6, -2.69f, 6, -6,
R_CUBIC_TO, 0, -3.31f, -2.69f, -6, -6, -6,
R_CUBIC_TO, -3.31f, 0, -6, 2.69f, -6, 6,
R_CUBIC_TO, 0, 3.31f, 2.69f, 6, 6, 6,
CLOSE,
R_MOVE_TO, -0.74f, -1.4f,
R_V_LINE_TO, -1.39f,
R_H_LINE_TO, 1.5f,
R_V_LINE_TO, 1.39f,
H_LINE_TO, 9.26f,
CLOSE,
MOVE_TO, 10, 5.6f,
R_CUBIC_TO, 1.66f, 0, 3, 1.25f, 3, 2.8f,
R_CUBIC_TO, 0, 1.75f, -2.24f, 1.88f, -2.24f, 3.46f,
H_LINE_TO, 9.26f,
CUBIC_TO, 9.26f, 9.58f, 11.5f, 9.8f, 11.5f, 8.4f,
R_CUBIC_TO, 0, -0.77f, -0.67f, -1.4f, -1.5f, -1.4f,
R_CUBIC_TO, -0.83f, 0, -1.5f, 0.63f, -1.5f, 1.4f,
H_LINE_TO, 7,
R_CUBIC_TO, 0, -1.55f, 1.34f, -2.8f, 3, -2.8f,
CLOSE
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