Added hover feedback on touch to launcher buttons.

ash/launcher/launcher_button.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/launcher/launcher_button.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/launcher/launcher_button_host.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/image_operations.h"
+#include "ui/aura/event.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/events.h"

[flackr, 2012/07/05 14:11:12]

Sort

[Kevin Greer, 2012/07/05 18:35:04]

Done.

 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/transform_util.h"
@@ skipping 291 matching lines @@
       bar_->ShowAttention(false);
     if (state & STATE_PENDING)
       icon_pulse_animation_.reset();
   }
 }
 
 gfx::Rect LauncherButton::GetIconBounds() const {
   return icon_view_->bounds();
 }
 
+ui::GestureStatus LauncherButton::OnGestureEvent(
+    const views::GestureEvent& event) {
+  ui::GestureStatus status = CustomButton::OnGestureEvent(event);
+
+  if (event.type() == ui::ET_GESTURE_TAP_DOWN)
+    AddState(STATE_HOVERED);

[flackr, 2012/07/05 14:11:12]

Since this class derives from CustomButton, I think we should make the hopping
animation based on CustomButton's HOT state_.

[Kevin Greer, 2012/07/05 21:06:05]

LauncherButton creates its own new set of states that it uses instead of those
defined by CustomButton.  LauncherButton's HOT state is defined as 1, the same
as CustomButton's HOVERED, so we can't really distinguish between them anyway. 
Are you sure it makes sense to mix & match states from different classes/enums? 
Can you please clarify what you have in mind?  Thanks  

On 2012/07/05 14:11:12, flackr wrote:

[flackr, 2012/07/06 03:12:59]

What I have in mind is to use CustomButton's tracking of the hover state.
Currently we are duplicating the effort of determining if the button is in its
hover state here even though CustomButton's state_ already tracks this. We
should rename this class's state to something descriptive of the states which it
would track, maybe launcher_state_? And then use the hover state from
CustomButton and remove the code here since it is already done in CustomButton.

On 2012/07/05 21:06:05, Kevin Greer wrote:

+  else if (event.type() == ui::ET_GESTURE_END)
+    ClearState(STATE_HOVERED);
+
+  return status;
+}
+
 bool LauncherButton::OnMousePressed(const views::MouseEvent& event) {
   CustomButton::OnMousePressed(event);
   host_->MousePressedOnButton(this, event);
   return true;
 }
 
 void LauncherButton::OnMouseReleased(const views::MouseEvent& event) {
   CustomButton::OnMouseReleased(event);
   host_->MouseReleasedOnButton(this, false);
 }
@@ skipping 125 matching lines @@
       bar_->SetVerticalAlignment(views::ImageView::CENTER);
       break;
   }
 
   Layout();
   SchedulePaint();
 }
 
 }  // namespace internal
 }  // namespace ash