DateView Touch Feedback

ash/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/system/date/date_view.h"
 
+#include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_utils.h"
+#include "base/command_line.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/base/l10n/l10n_util.h"
 #include "ui/views/border.h"
@@ skipping 98 matching lines @@
 
 void BaseDateTimeView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
 void BaseDateTimeView::OnLocaleChanged() {
   UpdateText();
 }
 
 DateView::DateView()
-    : hour_type_(ash::Shell::GetInstance()->system_tray_delegate()->
+    : active_(false),
+      touch_feedback_enabled_(false),
+      hour_type_(ash::Shell::GetInstance()->system_tray_delegate()->
                  GetHourClockType()),
       action_(TrayDate::NONE) {
   SetLayoutManager(
       new views::BoxLayout(
           views::BoxLayout::kVertical, 0, 0, 0));
   date_label_ = CreateLabel();
   date_label_->SetEnabledColor(kHeaderTextColorNormal);
   UpdateTextInternal(base::Time::Now());
   AddChildView(date_label_);
   SetFocusable(false);
+
+  if (CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kAshEnableTouchViewTouchFeedback)) {
+    touch_feedback_enabled_ = true;

[flackr, 2014/09/17 18:30:06]

Sorry for only recognizing this now but you can create a helper function to
query the flag which has a static initializer to avoid repeated commandline
checks. See for example bool IsDraggingTrayEnabled():
https://code.google.com/p/chromium/codesearch#chromium/src/ash/shelf/shelf_la...

This can be done once in a helper file (similar to
https://code.google.com/p/chromium/codesearch#chromium/src/ui/base/ui_base_sw...)
and will avoid us saving a separate flag status with each instance of each
object type which needs to know about it.

[jonross, 2014/09/30 18:31:33]

Done.

+  }
 }
 
 DateView::~DateView() {
 }
 
 void DateView::SetAction(TrayDate::DateAction action) {
   if (action == action_)
     return;
   if (IsMouseHovered()) {
     date_label_->SetEnabledColor(
         action == TrayDate::NONE ? kHeaderTextColorNormal :
                                    kHeaderTextColorHover);
     SchedulePaint();
   }
   action_ = action;
   SetFocusable(action_ != TrayDate::NONE);
 }
 
 void DateView::UpdateTimeFormat() {
   hour_type_ =
       ash::Shell::GetInstance()->system_tray_delegate()->GetHourClockType();
   UpdateText();
 }
 
 base::HourClockType DateView::GetHourTypeForTesting() const {
   return hour_type_;
 }
 
+void DateView::SetActive(bool active) {
+  if (active_ == active)
+    return;
+  active_ = active;
+  if (active_)
+    date_label_->SetEnabledColor(kHeaderTextColorHover);
+  else
+    date_label_->SetEnabledColor(kHeaderTextColorNormal);
+  SchedulePaint();
+}
+
 void DateView::UpdateTextInternal(const base::Time& now) {
   SetAccessibleName(
       base::TimeFormatFriendlyDate(now) +
       base::ASCIIToUTF16(", ") +
       base::TimeFormatTimeOfDayWithHourClockType(
           now, hour_type_, base::kKeepAmPm));
   date_label_->SetText(
       l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_DATE, FormatDayOfWeek(now), FormatDate(now)));
 }
 
 bool DateView::PerformAction(const ui::Event& event) {
   if (action_ == TrayDate::NONE)
     return false;
   if (action_ == TrayDate::SHOW_DATE_SETTINGS)
     ash::Shell::GetInstance()->system_tray_delegate()->ShowDateSettings();
   else if (action_ == TrayDate::SET_SYSTEM_TIME)
     ash::Shell::GetInstance()->system_tray_delegate()->ShowSetTimeDialog();
   return true;
 }
 
 void DateView::OnMouseEntered(const ui::MouseEvent& event) {
   if (action_ == TrayDate::NONE)
     return;
-  date_label_->SetEnabledColor(kHeaderTextColorHover);
-  SchedulePaint();
+  SetActive(true);
 }
 
 void DateView::OnMouseExited(const ui::MouseEvent& event) {
   if (action_ == TrayDate::NONE)
     return;
-  date_label_->SetEnabledColor(kHeaderTextColorNormal);
-  SchedulePaint();
+  SetActive(false);
+}
+
+void DateView::OnGestureEvent(ui::GestureEvent* event) {
+  if (touch_feedback_enabled_) {
+    if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
+      SetActive(true);
+    } else if (event->type() == ui::ET_GESTURE_TAP_CANCEL ||
+               event->type() == ui::ET_GESTURE_END) {
+      SetActive(false);
+    }
+  }
+  BaseDateTimeView::OnGestureEvent(event);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 TimeView::TimeView(TrayDate::ClockLayout clock_layout)
     : hour_type_(ash::Shell::GetInstance()->system_tray_delegate()->
                  GetHourClockType()) {
   SetupLabels();
   UpdateTextInternal(base::Time::Now());
   UpdateClockLayout(clock_layout);
@@ skipping 45 matching lines @@
 
 bool TimeView::PerformAction(const ui::Event& event) {
   return false;
 }
 
 bool TimeView::OnMousePressed(const ui::MouseEvent& event) {
   // Let the event fall through.
   return false;
 }
 
-void TimeView::UpdateClockLayout(TrayDate::ClockLayout clock_layout){
+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());
   } else {
     RemoveChildView(horizontal_label_.get());
     views::GridLayout* layout = new views::GridLayout(this);
@@ skipping 39 matching lines @@
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   label->SetFontList(label->font_list().DeriveWithStyle(
       label->font_list().GetFontStyle() & ~gfx::Font::BOLD));
 }
 
 }  // namespace tray
 }  // namespace ash