Change alpha for stroke to 0x5f.

Bug: 737271
Change-Id: Ic87eed4db221b93d4aca8d7bead66a4208b4b53f
Reviewed-on: https://chromium-review.googlesource.com/571174
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488722}

ui/views/controls/button/md_text_button.cc

@@ -250,6 +250,10 @@ void MdTextButton::UpdateColors() {
   if (!explicitly_set_normal_color()) {
     const auto colors = explicitly_set_colors();
     LabelButton::SetEnabledTextColors(enabled_text_color);
+    if (state() == STATE_DISABLED && !is_prominent_)
+      LabelButton::SetTextColor(STATE_DISABLED,
+                                style::GetColor(label()->text_context(),
+                                                style::STYLE_DISABLED, theme));
     set_explicitly_set_colors(colors);
   }
 
@@ -278,20 +282,24 @@ void MdTextButton::UpdateColors() {
     bg_color = color_utils::GetResultingPaintColor(shade, bg_color);
   }
 
-  // Specified text color: 5a5a5a @ 1.0 alpha
-  // Specified stroke color: 000000 @ 0.2 alpha
-  // 000000 @ 0.2 is very close to 5a5a5a @ 0.308 (== 0x4e); both are cccccc @
-  // 1.0, and this way if NativeTheme changes the button color, the button
-  // stroke will also change colors to match.
+  // Specified text color: 5a5a5a @ 1.0 alpha, 757575 @ 1.0 alpha for Harmony
+  // Specified stroke color: 000000 @ 0.2 alpha, Harmony and non-Harmony
+  // 000000 @ 0.2 is very close to 5a5a5a @ 0.308 (== 0x4e) or 757575 @ 0.37
+  // (== 0x5f); both are cccccc @ 1.0, and this way if NativeTheme changes the
+  // button color, the button stroke will also change colors to match.
   SkColor stroke_color =
-      is_prominent_ ? SK_ColorTRANSPARENT : SkColorSetA(text_color, 0x4e);
-
-  // Disabled, non-prominent buttons need their stroke lightened. Prominent
+      is_prominent_ ? SK_ColorTRANSPARENT
+                    : SkColorSetA(text_color,
+                                  UseMaterialSecondaryButtons() ? 0x5f : 0x4e);
+
+  // Disabled, non-prominent buttons need their stroke lightened. The Harmony
+  // spec asks for 000000 @ 0.1 alpha or e6e6e6 @ 1.0 alpha. The stroke color
+  // has already been translated above to cccccc @ 1.0 or 000000 @ 0.2.
+  // cccccc @ 0.25 (== 0x41) translates to e6e6e6 @ 1.0. To simplify the code,
+  // 000000 @ 0.1 is being used for both Harmony and non-Harmony. Prominent
   // buttons need it left at SK_ColorTRANSPARENT from above.
-  if (state() == STATE_DISABLED && !is_prominent_) {
-    stroke_color = color_utils::BlendTowardOppositeLuma(
-        stroke_color, gfx::kDisabledControlAlpha);
-  }
+  if (state() == STATE_DISABLED && !is_prominent_)
+    stroke_color = SkColorSetA(stroke_color, 0x41);
 
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   SetBackground(