views: Button ripple/highlight is visible during shelf swipe.

ui/views/animation/ink_drop_host_view.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/views/animation/ink_drop_host_view.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/events/event.h"
 #include "ui/events/scoped_target_handler.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 57 matching lines @@
         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:
         ink_drop_state = InkDropState::ALTERNATE_ACTION_TRIGGERED;
         break;
       case ui::ET_GESTURE_END:
-      case ui::ET_GESTURE_SCROLL_BEGIN:
+      case ui::ET_GESTURE_TAP_CANCEL:

[bruthig, 2017/04/27 13:58:46]

Do you know if a TAP_CANCEL happen whenever a SCROLL_BEGIN happens?

[sammiequon, 2017/04/28 04:58:03]

Oops, I did not mean to remove the SCROLL_BEGIN here.

         if (current_ink_drop_state == InkDropState::ACTIVATED)
           return;
         ink_drop_state = InkDropState::HIDDEN;
         break;
       default:
         return;
     }
 
     if (ink_drop_state == InkDropState::HIDDEN &&
         (current_ink_drop_state == InkDropState::ACTION_TRIGGERED ||

[bruthig, 2017/04/27 13:58:46]

Can you add a clause here so that we don't initiate a HIDDEN animation if the
|current_ink_drop_state| is already HIDDEN? You will have to update some tests,
including reverting the test changes you already made.

[sammiequon, 2017/04/28 04:58:03]

Done.

          current_ink_drop_state == InkDropState::ALTERNATE_ACTION_TRIGGERED ||
          current_ink_drop_state == InkDropState::DEACTIVATED)) {
       // These InkDropStates automatically transition to the HIDDEN state so we
       // don't make an explicit call. Explicitly animating to HIDDEN in this
       // case would prematurely pre-empt these animations.
       return;
     }
     host_view_->AnimateInkDrop(ink_drop_state, event);
   }
 
@@ skipping 192 matching lines @@
 std::unique_ptr<InkDropImpl>
 InkDropHostView::CreateDefaultFloodFillInkDropImpl() {
   std::unique_ptr<views::InkDropImpl> ink_drop =
       InkDropHostView::CreateDefaultInkDropImpl();
   ink_drop->SetAutoHighlightMode(
       views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
   return ink_drop;
 }
 
 }  // namespace views