Implement time stamp in new-style notification.

ui/message_center/views/notification_header_view.cc

 // Copyright 2017 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 "ui/message_center/views/notification_header_view.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/vector_icons.h"
 #include "ui/message_center/views/padded_button.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/painter.h"
 
 namespace message_center {
 
 namespace {
 
 constexpr int kHeaderHeight = 28;
 constexpr int kAppIconSize = 12;
 constexpr int kExpandIconSize = 12;
 constexpr gfx::Insets kHeaderPadding(0, 12, 0, 2);
 constexpr int kHeaderHorizontalSpacing = 2;
 constexpr int kAppInfoConatainerTopPadding = 12;
 // Bullet character. The divider symbol between different parts of the header.
-constexpr base::char16 kNotificationHeaderDividerSymbol = 0x2022;
+constexpr wchar_t kNotificationHeaderDivider[] = L" \u2022 ";
 
 // Base ink drop color of action buttons.
 const SkColor kInkDropBaseColor = SkColorSetRGB(0x0, 0x0, 0x0);
 // Ripple ink drop opacity of action buttons.
 constexpr float kInkDropRippleVisibleOpacity = 0.08f;
 // Highlight (hover) ink drop opacity of action buttons.
 constexpr float kInkDropHighlightVisibleOpacity = 0.08f;
 
+// base::TimeBase has similar constants, but some of them are missing.
+constexpr int64_t kMinuteInMillis = 60LL * 1000LL;
+constexpr int64_t kHourInMillis = 60LL * kMinuteInMillis;
+constexpr int64_t kDayInMillis = 24LL * kHourInMillis;
+constexpr int64_t kYearInMillis = 365LL * kDayInMillis;

[fukino, 2017/07/05 07:08:27]

BTW, in Android, YEAR_IN_MILLIS is 364 days.
https://developer.android.com/reference/android/text/format/DateUtils.html#YE...

I'm not sure why and I think 365 days here is OK.
It's up to you to choose 364/365. JFYI.

[tetsui, 2017/07/05 07:28:56]

Done. It seems Android did YEAR_IN_MILLIS = WEEK_IN_MILLIS * 52, and it's kept
for compatibility.

+
 // ExpandButtton forwards all mouse and key events to NotificationHeaderView,
 // but takes tab focus for accessibility purpose.
 class ExpandButton : public views::ImageView {
  public:
   ExpandButton();
   ~ExpandButton() override;
 
   void OnPaint(gfx::Canvas* canvas) override;
   void OnFocus() override;
   void OnBlur() override;
@@ skipping 20 matching lines @@
 void ExpandButton::OnFocus() {
   views::ImageView::OnFocus();
   SchedulePaint();
 }
 
 void ExpandButton::OnBlur() {
   views::ImageView::OnBlur();
   SchedulePaint();
 }
 
+// Do relative time string formatting that is similar to
+// com.java.android.widget.DateTimeView.updateRelativeTime.
+// Chromium has its own base::TimeFormat::Simple(), but none of the formats
+// supported by the function is similar to Android's one.
+base::string16 FormatToRelativeTime(base::Time past) {
+  base::Time now = base::Time::Now();
+  int64_t duration = (now - past).InMilliseconds();
+  if (duration < kMinuteInMillis) {
+    return l10n_util::GetStringUTF16(
+        IDS_MESSAGE_NOTIFICATION_NOW_STRING_SHORTEST);
+  } else if (duration < kHourInMillis) {
+    int count = static_cast<int>(duration / kMinuteInMillis);
+    return l10n_util::GetPluralStringFUTF16(
+        IDS_MESSAGE_NOTIFICATION_DURATION_MINUTES_SHORTEST, count);
+  } else if (duration < kDayInMillis) {
+    int count = static_cast<int>(duration / kHourInMillis);
+    return l10n_util::GetPluralStringFUTF16(
+        IDS_MESSAGE_NOTIFICATION_DURATION_HOURS_SHORTEST, count);
+  } else if (duration < kYearInMillis) {
+    int count = static_cast<int>(duration / kDayInMillis);
+    return l10n_util::GetPluralStringFUTF16(
+        IDS_MESSAGE_NOTIFICATION_DURATION_DAYS_SHORTEST, count);
+  } else {
+    int count = static_cast<int>(duration / kYearInMillis);
+    return l10n_util::GetPluralStringFUTF16(
+        IDS_MESSAGE_NOTIFICATION_DURATION_YEARS_SHORTEST, count);
+  }
+}
+
 }  // namespace
 
 NotificationHeaderView::NotificationHeaderView(views::ButtonListener* listener)
     : views::CustomButton(listener) {
   SetInkDropMode(InkDropMode::ON);
   set_has_ink_drop_action_on_click(true);
   set_animate_on_state_change(true);
   set_notify_enter_exit_on_child(true);
   set_ink_drop_base_color(kInkDropBaseColor);
   set_ink_drop_visible_opacity(kInkDropRippleVisibleOpacity);
@@ skipping 22 matching lines @@
   // App name view
   const gfx::FontList& font_list = views::Label().font_list().Derive(
       -2, gfx::Font::NORMAL, gfx::Font::Weight::NORMAL);
   app_name_view_ = new views::Label(base::string16());
   app_name_view_->SetFontList(font_list);
   app_name_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   app_info_container->AddChildView(app_name_view_);
 
   // Summary text divider
   summary_text_divider_ =
-      new views::Label(base::ASCIIToUTF16(" ") +
-                       base::string16(1, kNotificationHeaderDividerSymbol) +
-                       base::ASCIIToUTF16(" "));
+      new views::Label(base::WideToUTF16(kNotificationHeaderDivider));
   summary_text_divider_->SetFontList(font_list);
   summary_text_divider_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   summary_text_divider_->SetVisible(false);
   app_info_container->AddChildView(summary_text_divider_);
 
   // Summary text view
   summary_text_view_ = new views::Label(base::string16());
   summary_text_view_->SetFontList(font_list);
   summary_text_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   summary_text_view_->SetVisible(false);
   app_info_container->AddChildView(summary_text_view_);
 
+  // Timestamp divider
+  timestamp_divider_ =
+      new views::Label(base::WideToUTF16(kNotificationHeaderDivider));
+  timestamp_divider_->SetFontList(font_list);
+  timestamp_divider_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  timestamp_divider_->SetVisible(false);
+  app_info_container->AddChildView(timestamp_divider_);
+
+  // Timestamp view
+  timestamp_view_ = new views::Label(base::string16());
+  timestamp_view_->SetFontList(font_list);
+  timestamp_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  timestamp_view_->SetVisible(false);
+  app_info_container->AddChildView(timestamp_view_);
+
   // Expand button view
   expand_button_ = new ExpandButton();
   app_info_container->AddChildView(expand_button_);
 
   // Spacer between left-aligned views and right-aligned views
   views::View* spacer = new views::View;
   spacer->SetPreferredSize(gfx::Size(1, kHeaderHeight));
   AddChildView(spacer);
   layout->SetFlexForView(spacer, 1);
 
@@ skipping 45 matching lines @@
     has_overflow_indicator_ = false;
   }
   UpdateSummaryTextVisibility();
 }
 
 void NotificationHeaderView::ClearOverflowIndicator() {
   has_overflow_indicator_ = false;
   UpdateSummaryTextVisibility();
 }
 
+void NotificationHeaderView::SetTimestamp(base::Time past) {
+  timestamp_view_->SetText(FormatToRelativeTime(past));
+  has_timestamp_ = true;
+  UpdateSummaryTextVisibility();
+}
+
+void NotificationHeaderView::ClearTimestamp() {
+  has_timestamp_ = false;
+  UpdateSummaryTextVisibility();
+}
+
 void NotificationHeaderView::SetExpandButtonEnabled(bool enabled) {
   // SetInkDropMode iff. the visibility changed.
   // Otherwise, the ink drop animation cannot finish.
   if (expand_button_->visible() != enabled)
     SetInkDropMode(enabled ? InkDropMode::ON : InkDropMode::OFF);
 
   expand_button_->SetVisible(enabled);
 }
 
 void NotificationHeaderView::SetExpanded(bool expanded) {
@@ skipping 65 matching lines @@
                                is_control_buttons_visible_);
   close_button_->SetVisible(close_button_enabled_ &&
                             is_control_buttons_visible_);
   Layout();
 }
 
 void NotificationHeaderView::UpdateSummaryTextVisibility() {
   const bool visible = has_progress_ || has_overflow_indicator_;
   summary_text_divider_->SetVisible(visible);
   summary_text_view_->SetVisible(visible);
+  timestamp_divider_->SetVisible(!has_progress_ && has_timestamp_);
+  timestamp_view_->SetVisible(!has_progress_ && has_timestamp_);
   Layout();
 }
 
 }  // namespace message_center