Tweaks for: Toggle spoken feedback if two fingers are held down

ui/chromeos/touch_accessibility_enabler.cc

 // Copyright 2016 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/chromeos/touch_accessibility_enabler.h"
 
 #include <math.h>
 
 #include <utility>
 
 #include "base/logging.h"
+#include "base/metrics/user_metrics.h"
 #include "base/time/default_tick_clock.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 
 namespace ui {
 
 namespace {
 
 // Delay between timer callbacks. Each one plays a tick sound.
 constexpr int kTimerDelayInMS = 500;
 
+// The number of ticks of the timer before the first sound is generated.
+constexpr int kTimerTicksOfFirstSoundFeedback = 6;
+
 // The number of ticks of the timer before toggling spoken feedback.
-constexpr int kTimerTicksToToggleSpokenFeedback = 7;
+constexpr int kTimerTicksToToggleSpokenFeedback = 10;
 
 }  // namespace
 
 TouchAccessibilityEnabler::TouchAccessibilityEnabler(
     aura::Window* root_window,
     TouchAccessibilityEnablerDelegate* delegate)
     : root_window_(root_window),
       delegate_(delegate),
       state_(NO_FINGERS_DOWN),
       tick_clock_(NULL) {
@@ skipping 89 matching lines @@
 void TouchAccessibilityEnabler::CancelTimer() {
   if (timer_.IsRunning())
     timer_.Stop();
 }
 
 void TouchAccessibilityEnabler::OnTimer() {
   base::TimeTicks now = Now();
   double tick_count_f =
       (now - two_finger_start_time_).InMillisecondsF() / kTimerDelayInMS;
   int tick_count = roundf(tick_count_f);
-  if (tick_count >= 1 && tick_count < kTimerTicksToToggleSpokenFeedback) {
+
+  if (tick_count == kTimerTicksOfFirstSoundFeedback)

[Ilya Sherman, 2016/11/16 23:11:33]

nit: Please add curly braces, since the body of this if-stmt spans multiple
lines.

[oshima, 2016/11/22 21:57:38]

+1

[dmazzoni, 2016/11/22 22:31:55]

Done.

+    base::RecordAction(
+        base::UserMetricsAction("Accessibility.TwoFingersHeldDown"));
+
+  if (tick_count >= kTimerTicksOfFirstSoundFeedback &&
+      tick_count < kTimerTicksToToggleSpokenFeedback) {
     delegate_->PlaySpokenFeedbackToggleCountdown(tick_count);
   }
   if (tick_count == kTimerTicksToToggleSpokenFeedback) {
     delegate_->ToggleSpokenFeedback();
     state_ = WAIT_FOR_NO_FINGERS;
   }
 }
 
 }  // namespace ui