Simplify layout of tray items and fix spacing for MD.

ash/common/system/date/date_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/date/date_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_shell.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "grit/ash_strings.h"
 #include "third_party/icu/source/i18n/unicode/datefmt.h"
 #include "third_party/icu/source/i18n/unicode/dtptngen.h"
 #include "third_party/icu/source/i18n/unicode/smpdtfmt.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace tray {
 namespace {
 
 // Amount of slop to add into the timer to make sure we're into the next minute
 // when the timer goes off.
 const int kTimerSlopSeconds = 1;
 
 // Text color of the vertical clock minutes.
 const SkColor kVerticalClockMinuteColor = SkColorSetRGB(0xBA, 0xBA, 0xBA);
 
 // Padding between the left edge of the shelf and the left edge of the vertical
 // clock.
 const int kVerticalClockLeftPadding = 9;
 
 // Offset used to bring the minutes line closer to the hours line in the
 // vertical clock.
 const int kVerticalClockMinutesTopOffset = -4;
 const int kVerticalClockMinutesTopOffsetMD = -2;
 
-// Leading padding used to draw the tray background to the left of the clock
 // when the shelf is horizontally aligned, and on the top when the shelf is

[tdanderson, 2016/10/27 23:58:41]

Looks like you deleted some of this comment by mistake

[Evan Stade, 2016/10/28 18:07:49]

Done.

 // vertically aligned.
 const int kClockLeadingPadding = 8;
 
 base::string16 FormatDate(const base::Time& time) {
   icu::UnicodeString date_string;
   std::unique_ptr<icu::DateFormat> formatter(
       icu::DateFormat::createDateInstance(icu::DateFormat::kMedium));
   formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string);
   return base::string16(date_string.getBuffer(),
                         static_cast<size_t>(date_string.length()));
@@ skipping 223 matching lines @@
 bool TimeView::OnMousePressed(const ui::MouseEvent& event) {
   // Let the event fall through.
   return false;
 }
 
 void TimeView::UpdateClockLayout(TrayDate::ClockLayout clock_layout) {
   SetBorderFromLayout(clock_layout);
   if (clock_layout == TrayDate::HORIZONTAL_CLOCK) {
     RemoveChildView(vertical_label_hours_.get());
     RemoveChildView(vertical_label_minutes_.get());
-    SetLayoutManager(
-        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
     AddChildView(horizontal_label_.get());
+    SetLayoutManager(new views::FillLayout());
   } else {
     const bool is_material_design = MaterialDesignController::IsShelfMaterial();
     RemoveChildView(horizontal_label_.get());
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
     const int kColumnId = 0;
     views::ColumnSet* columns = layout->AddColumnSet(kColumnId);
     columns->AddPaddingColumn(0, kVerticalClockLeftPadding);
     columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                        0, views::GridLayout::USE_PREF, 0, 0);
     layout->AddPaddingRow(
         0, is_material_design ? kClockLeadingPadding
                               : kTrayLabelItemVerticalPaddingVerticalAlignment);
     layout->StartRow(0, kColumnId);
     layout->AddView(vertical_label_hours_.get());
     layout->StartRow(0, kColumnId);
     layout->AddView(vertical_label_minutes_.get());
     layout->AddPaddingRow(0,
                           is_material_design
                               ? GetTrayConstant(TRAY_IMAGE_ITEM_PADDING) +
                                     kVerticalClockMinutesTopOffsetMD
                               : kTrayLabelItemVerticalPaddingVerticalAlignment);
   }
   Layout();
 }
 
 void TimeView::SetBorderFromLayout(TrayDate::ClockLayout clock_layout) {
-  if (clock_layout == TrayDate::HORIZONTAL_CLOCK) {
-    bool is_material_design = MaterialDesignController::IsShelfMaterial();
-    const int time_view_left_padding =
-        is_material_design ? kClockLeadingPadding
-                           : kTrayLabelItemHorizontalPaddingBottomAlignment;
-    const int time_view_right_padding =
-        is_material_design ? GetTrayConstant(TRAY_IMAGE_ITEM_PADDING)
-                           : kTrayLabelItemHorizontalPaddingBottomAlignment;
-    SetBorder(views::Border::CreateEmptyBorder(0, time_view_left_padding, 0,
-                                               time_view_right_padding));
+  if (!MaterialDesignController::IsShelfMaterial() &&
+      clock_layout == TrayDate::HORIZONTAL_CLOCK) {
+    SetBorder(views::Border::CreateEmptyBorder(
+        0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0,
+        kTrayLabelItemHorizontalPaddingBottomAlignment));
   } else {
     SetBorder(views::Border::NullBorder());

[tdanderson, 2016/10/27 23:58:41]

Double-checking: this will set a null border if MD is enabled and the clock is
vertical. Do you want to do that?

[Evan Stade, 2016/10/28 18:07:49]

It's not harmful, but I guess it's not really necessary. Added early return for
md.

   }
 }
 
 void TimeView::SetupLabels() {
   horizontal_label_.reset(new views::Label());
   SetupLabel(horizontal_label_.get());
   vertical_label_hours_.reset(new views::Label());
   SetupLabel(vertical_label_hours_.get());
   vertical_label_minutes_.reset(new views::Label());
   SetupLabel(vertical_label_minutes_.get());
   // TODO(estade): this should use the NativeTheme's secondary text color.
   vertical_label_minutes_->SetEnabledColor(kVerticalClockMinuteColor);
   // Pull the minutes up closer to the hours by using a negative top border.
   vertical_label_minutes_->SetBorder(views::Border::CreateEmptyBorder(
       MaterialDesignController::IsShelfMaterial()
           ? kVerticalClockMinutesTopOffsetMD
           : kVerticalClockMinutesTopOffset,
       0, 0, 0));
 }
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   label->SetElideBehavior(gfx::NO_ELIDE);
 }
 
 }  // namespace tray
 }  // namespace ash