Commit 004ef605 authored by Megumi Hattori's avatar Megumi Hattori Committed by Commit Bot

Fix color of text and icon in notification inline reply.

According the mock (http://shortn/_WV9xAY7nir), the text "Placeholder"
in the text field and the paper airplane icon in the notification reply
should be transparent white. After inputting text, they should be opaque
white.

However, they were transparent black. After inputting text, they were
opaque black.

This CL fixes the color of them.

BUG=815134
TEST=manual

Change-Id: I68d5ef9373c1cc537e05aa6785c724a55b95b137
Reviewed-on: https://chromium-review.googlesource.com/934482Reviewed-by: default avatarYoshiki Iguchi <yoshiki@chromium.org>
Reviewed-by: default avatarTetsui Ohkubo <tetsui@chromium.org>
Commit-Queue: Megumi Hattori <megumihattori@google.com>
Cr-Commit-Position: refs/heads/master@{#539076}
parent 5c2a3b92
...@@ -88,6 +88,12 @@ constexpr SkColor kDimTextColorMD = SkColorSetRGB(0x75, 0x75, 0x75); ...@@ -88,6 +88,12 @@ constexpr SkColor kDimTextColorMD = SkColorSetRGB(0x75, 0x75, 0x75);
// Background of inline settings area. // Background of inline settings area.
const SkColor kSettingsRowBackgroundColor = SkColorSetRGB(0xee, 0xee, 0xee); const SkColor kSettingsRowBackgroundColor = SkColorSetRGB(0xee, 0xee, 0xee);
// Text color and icon color of inline reply area when the textfield is empty.
constexpr SkColor kTextfieldPlaceholderTextColorMD =
SkColorSetA(SK_ColorWHITE, 0x8A);
constexpr SkColor kTextfieldPlaceholderIconColorMD =
SkColorSetA(SK_ColorWHITE, 0x60);
// The icon size of inline reply input field. // The icon size of inline reply input field.
constexpr int kInputReplyButtonSize = 20; constexpr int kInputReplyButtonSize = 20;
...@@ -379,9 +385,9 @@ NotificationInputTextfieldMD::NotificationInputTextfieldMD( ...@@ -379,9 +385,9 @@ NotificationInputTextfieldMD::NotificationInputTextfieldMD(
views::TextfieldController* controller) views::TextfieldController* controller)
: index_(0) { : index_(0) {
set_controller(controller); set_controller(controller);
SetTextColor(SK_ColorBLACK); SetTextColor(SK_ColorWHITE);
SetBackgroundColor(SK_ColorTRANSPARENT); SetBackgroundColor(SK_ColorTRANSPARENT);
set_placeholder_text_color(SkColorSetA(SK_ColorBLACK, 0x8A)); set_placeholder_text_color(kTextfieldPlaceholderTextColorMD);
SetBorder(views::CreateEmptyBorder(kInputTextfieldPadding)); SetBorder(views::CreateEmptyBorder(kInputTextfieldPadding));
} }
...@@ -412,14 +418,14 @@ NotificationInputReplyButtonMD::~NotificationInputReplyButtonMD() = default; ...@@ -412,14 +418,14 @@ NotificationInputReplyButtonMD::~NotificationInputReplyButtonMD() = default;
void NotificationInputReplyButtonMD::SetNormalImage() { void NotificationInputReplyButtonMD::SetNormalImage() {
SetImage(STATE_NORMAL, SetImage(STATE_NORMAL,
gfx::CreateVectorIcon(kNotificationInlineReplyIcon, gfx::CreateVectorIcon(kNotificationInlineReplyIcon,
kInputReplyButtonSize, SK_ColorBLACK)); kInputReplyButtonSize, SK_ColorWHITE));
} }
void NotificationInputReplyButtonMD::SetPlaceholderImage() { void NotificationInputReplyButtonMD::SetPlaceholderImage() {
SetImage( SetImage(
STATE_NORMAL, STATE_NORMAL,
gfx::CreateVectorIcon(kNotificationInlineReplyIcon, kInputReplyButtonSize, gfx::CreateVectorIcon(kNotificationInlineReplyIcon, kInputReplyButtonSize,
SkColorSetA(SK_ColorBLACK, 0x60))); kTextfieldPlaceholderIconColorMD));
} }
// NotificationInputContainerMD //////////////////////////////////////////////// // NotificationInputContainerMD ////////////////////////////////////////////////
......
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