Modified state flow for touch explore released in touch_exploration_controller.

ui/chromeos/touch_exploration_controller.cc

 // Copyright 2014 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_exploration_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
@@ skipping 221 matching lines @@
   if (current_touch_ids_.size() > 1) {
     state_ = WAIT_FOR_ONE_FINGER;
     return ui::EVENT_REWRITE_DISCARD;
   }
   if (type == ui::ET_TOUCH_PRESSED) {
     // If there is no touch exploration yet, we can't send a click, so discard.
     if (!last_touch_exploration_) {
       tap_timer_.Stop();
       return ui::EVENT_REWRITE_DISCARD;
     }
-    // This is the second tap in a double-tap (or double tap-hold).
-    // We set the tap timer. If it fires before the user lifts their finger,
-    // one-finger passthrough begins. Otherwise, there is a touch press and
-    // release at the location of the last touch exploration.
-    state_ = DOUBLE_TAP_PENDING;
-    VLOG_STATE();
-    StartTapTimer();
-    // This will update as the finger moves before a possible passthrough, and
-    // will determine the offset.
-    last_unused_finger_event_.reset(new ui::TouchEvent(event));
-    return ui::EVENT_REWRITE_DISCARD;
+    if (state_ == SINGLE_TAP_RELEASED) {
+      // This is the second tap in a double-tap (or double tap-hold).
+      // We set the tap timer. If it fires before the user lifts their finger,
+      // one-finger passthrough begins. Otherwise, there is a touch press and
+      // release at the location of the last touch exploration.
+      state_ = DOUBLE_TAP_PENDING;
+      VLOG_STATE();
+      StartTapTimer();
+      // This will update as the finger moves before a possible passthrough, and
+      // will determine the offset.
+      last_unused_finger_event_.reset(new ui::TouchEvent(event));
+      return ui::EVENT_REWRITE_DISCARD;
+    } else if (state_ == TOUCH_EXPLORE_RELEASED) {
+      // This is the initial "press" (location, time, and touch id) of a single
+      // tap click.
+      initial_press_.reset(new ui::TouchEvent(event));
+      rewritten_event->reset(
+          new ui::TouchEvent(ui::ET_TOUCH_PRESSED,
+                             last_touch_exploration_->location(),
+                             initial_press_->touch_id(),
+                             event.time_stamp()));
+      (*rewritten_event)->set_flags(event.flags());
+      state_ = TOUCH_RELEASE_PENDING;
+      VLOG_STATE();
+      return ui::EVENT_REWRITE_REWRITTEN;
+    }
   } else if (type == ui::ET_TOUCH_RELEASED && !last_touch_exploration_) {
     // If the previous press was discarded, we need to also handle its
     // release.
     if (current_touch_ids_.size() == 0) {
       ResetToNoFingersDown();
     }
     return ui::EVENT_REWRITE_DISCARD;
   } else if (type == ui::ET_TOUCH_MOVED) {
     return ui::EVENT_REWRITE_DISCARD;
   }
@@ skipping 610 matching lines @@
       return "SLIDE_GESTURE";
     case ONE_FINGER_PASSTHROUGH:
       return "ONE_FINGER_PASSTHROUGH";
     case WAIT_FOR_ONE_FINGER:
       return "WAIT_FOR_ONE_FINGER";
   }
   return "Not a state";
 }
 
 }  // namespace ui