Index: ui/views/animation/ink_drop_host_view.cc |
diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc |
index b7ae651a92e932a7d831921b8fcd3d30694d407c..3582be165b5f7fc8c589e61b6c70604f4488e8a7 100644 |
--- a/ui/views/animation/ink_drop_host_view.cc |
+++ b/ui/views/animation/ink_drop_host_view.cc |
@@ -58,6 +58,8 @@ class InkDropHostView::InkDropGestureHandler : public ui::EventHandler { |
InkDropState ink_drop_state = InkDropState::HIDDEN; |
switch (event->type()) { |
case ui::ET_GESTURE_TAP_DOWN: |
+ if (current_ink_drop_state == InkDropState::ACTIVATED) |
bruthig
2016/07/26 13:57:15
Can you double check this logic still works well w
mohsen
2016/07/26 20:00:58
This seems to work. The activated ripple is hidden
|
+ return; |
ink_drop_state = InkDropState::ACTION_PENDING; |
// The ui::ET_GESTURE_TAP_DOWN event needs to be marked as handled so |
// that |
@@ -65,6 +67,8 @@ class InkDropHostView::InkDropGestureHandler : public ui::EventHandler { |
event->SetHandled(); |
break; |
case ui::ET_GESTURE_LONG_PRESS: |
+ if (current_ink_drop_state == InkDropState::ACTIVATED) |
+ return; |
ink_drop_state = InkDropState::ALTERNATE_ACTION_PENDING; |
break; |
case ui::ET_GESTURE_LONG_TAP: |