CrOS sys tray: fix padding to better match spec

A few changes here:

* Specify padding on both ends of the whole tray separately (instead
  of using space around some tray items to build it up)
* Override the size function for the battery to better match its
  actual visual footprint.
* Specify padding between items with one single number, used at the
  layout level.

This all allows for simpler code while better matching the specs.

Bug: 901989
Change-Id: Ia75dcfc7b355b114e6492c26ee4ce6372af92f71
Reviewed-on: https://chromium-review.googlesource.com/c/1328042
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Reviewed-by: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609183}

ash/system/date/date_view.cc

@@ -220,8 +220,7 @@ void TimeView::UpdateClockLayout(ClockLayout clock_layout) {
     layout->AddView(vertical_label_hours_.get());
     layout->StartRow(0, kColumnId);
     layout->AddView(vertical_label_minutes_.get());
-    layout->AddPaddingRow(
-        0, kTrayImageItemPadding + kVerticalClockMinutesTopOffset);
+    layout->AddPaddingRow(0, kVerticalClockMinutesTopOffset);
   }
   Layout();
 }

ash/system/power/tray_power.cc

@@ -51,6 +51,15 @@ PowerTrayView::~PowerTrayView() {
   PowerStatus::Get()->RemoveObserver(this);
 }
 
+gfx::Size PowerTrayView::CalculatePreferredSize() const {
+  // The battery icon is a lot thinner than other icons, hence the special
+  // logic.
+  gfx::Size standard_size = TrayItemView::CalculatePreferredSize();
+  if (IsHorizontalAlignment())
+    return gfx::Size(kUnifiedTrayBatteryWidth, standard_size.height());
+  return standard_size;
+}
+
 void PowerTrayView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->SetName(accessible_name_);
   node_data->role = ax::mojom::Role::kButton;

ash/system/power/tray_power.h

@@ -25,6 +25,7 @@ class PowerTrayView : public TrayItemView,
   ~PowerTrayView() override;
 
   // views::View:
+  gfx::Size CalculatePreferredSize() const override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   views::View* GetTooltipHandlerForPoint(const gfx::Point& point) override;
   bool GetTooltipText(const gfx::Point& p,

ash/system/tray/tray_constants.h

@@ -173,9 +173,10 @@ constexpr gfx::Insets kUnifiedSliderPadding(0, 16);
 constexpr int kUnifiedMenuVerticalPadding = 8;
 constexpr int kUnifiedNotificationCenterSpacing = 16;
 constexpr int kUnifiedTrayIconSize = 20;
-constexpr int kUnifiedTraySpacingBetweenIcons = 2;
+constexpr int kUnifiedTraySpacingBetweenIcons = 6;
+constexpr int kUnifiedTrayBatteryWidth = 10;
 constexpr int kUnifiedTrayCornerRadius = 20;
-constexpr int kUnifiedTrayContentPadding = 5;
+constexpr int kUnifiedTrayContentPadding = 8;
 constexpr int kUnifiedTopShortcutSpacing = 16;
 constexpr int kUnifiedNotificationHiddenLineHeight = 20;
 constexpr gfx::Insets kUnifiedTopShortcutPadding(0, 16);

ash/system/tray/tray_container.cc

@@ -68,14 +68,8 @@ void TrayContainer::UpdateLayout() {
       is_horizontal ? views::BoxLayout::kHorizontal
                     : views::BoxLayout::kVertical;
 
-  const int hit_region_with_separator =
-      kHitRegionPadding + TrayConstants::separator_width();
-  gfx::Insets insets(
-      is_horizontal
-          ? gfx::Insets(0, kHitRegionPadding, 0, hit_region_with_separator)
-          : gfx::Insets(kHitRegionPadding, 0, hit_region_with_separator, 0));
-  if (base::i18n::IsRTL())
-    insets.Set(insets.top(), insets.right(), insets.bottom(), insets.left());
+  gfx::Insets insets(is_horizontal ? gfx::Insets(0, kHitRegionPadding)
+                                   : gfx::Insets(kHitRegionPadding, 0));
   SetBorder(views::CreateEmptyBorder(insets));
 
   int horizontal_margin = main_axis_margin_;

ash/system/tray/tray_item_view.cc

@@ -83,17 +83,17 @@ int TrayItemView::GetAnimationDurationMS() {
   return kTrayItemAnimationDurationMS;
 }
 
+bool TrayItemView::IsHorizontalAlignment() const {
+  return shelf_->IsHorizontalAlignment();
+}
+
 gfx::Size TrayItemView::CalculatePreferredSize() const {
   DCHECK_EQ(1, child_count());
-  gfx::Size inner_size = views::View::CalculatePreferredSize();
+  gfx::Size size = views::View::CalculatePreferredSize();
   if (image_view_) {
-    inner_size = gfx::Size(TrayConstants::GetTrayIconSize(),
-                           TrayConstants::GetTrayIconSize());
+    size = gfx::Size(kUnifiedTrayIconSize, kUnifiedTrayIconSize);
   }
-  gfx::Rect rect(inner_size);
-  if (label_)
-    rect.Inset(gfx::Insets(-kTrayImageItemPadding));
-  gfx::Size size = rect.size();
+
   if (!animation_.get() || !animation_->is_animating())
     return size;
   if (shelf_->IsHorizontalAlignment()) {

ash/system/tray/tray_item_view.h

@@ -24,7 +24,7 @@ class ImageView;
 namespace ash {
 class Shelf;
 
-// Lable view which can be given a different data from the visible label.
+// Label view which can be given a different data from the visible label.
 // IME icons like "US" (US keyboard) or "あ(Google Japanese Input)" are
 // rendered as a label, but reading such text literally will not always be
 // understandable.
@@ -67,6 +67,9 @@ class ASH_EXPORT TrayItemView : public views::View,
   // The default animation duration is 200ms. But each view can customize this.
   virtual int GetAnimationDurationMS();
 
+  // Returns whether the shelf is horizontal.
+  bool IsHorizontalAlignment() const;
+
  private:
   // Overridden from views::View.
   void ChildPreferredSizeChanged(View* child) override;