| Index: ash/launcher/app_list_button.cc
|
| diff --git a/ash/launcher/app_list_button.cc b/ash/launcher/app_list_button.cc
|
| index 14e80e57900489be6bdea8d62e49d5404935c341..d38fe2215d7077b0a5c92b1bc2a989c2733eee69 100644
|
| --- a/ash/launcher/app_list_button.cc
|
| +++ b/ash/launcher/app_list_button.cc
|
| @@ -4,35 +4,113 @@
|
|
|
| #include "ash/launcher/app_list_button.h"
|
|
|
| +#include <vector>
|
| +
|
| #include "ash/launcher/launcher_button_host.h"
|
| +#include "ash/launcher/launcher_types.h"
|
| +#include "grit/ash_strings.h"
|
| +#include "grit/ui_resources.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/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #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"
|
| -#include "ui/views/controls/image_view.h"
|
|
|
| namespace ash {
|
| -
|
| namespace internal {
|
|
|
| +namespace {
|
| +
|
| +const int kAnimationDurationInMs = 600;
|
| +const float kAnimationOpacity[] = { 0.4f, 0.8f, 0.4f };
|
| +const float kAnimationScale[] = { 0.8f, 1.0f, 0.8f };
|
| +
|
| +} // namespace
|
| +
|
| AppListButton::AppListButton(views::ButtonListener* listener,
|
| LauncherButtonHost* host)
|
| : views::ImageButton(listener),
|
| - host_(host) {}
|
| + host_(host) {
|
| + ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| + SetImage(
|
| + views::CustomButton::BS_NORMAL,
|
| + rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToImageSkia());
|
| + SetImage(
|
| + views::CustomButton::BS_HOT,
|
| + rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).
|
| + ToImageSkia());
|
| + SetImage(
|
| + views::CustomButton::BS_PUSHED,
|
| + rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).
|
| + ToImageSkia());
|
| + SetAccessibleName(l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE));
|
| + SetSize(gfx::Size(kLauncherPreferredSize, kLauncherPreferredSize));
|
| +}
|
|
|
| AppListButton::~AppListButton() {
|
| }
|
|
|
| +void AppListButton::StartLoadingAnimation() {
|
| + // The two animation set should have the same size.
|
| + DCHECK_EQ(arraysize(kAnimationOpacity), arraysize(kAnimationScale));
|
| +
|
| + layer()->GetAnimator()->StopAnimating();
|
| +
|
| + scoped_ptr<ui::LayerAnimationSequence> opacity_sequence(
|
| + new ui::LayerAnimationSequence());
|
| + scoped_ptr<ui::LayerAnimationSequence> transform_sequence(
|
| + new ui::LayerAnimationSequence());
|
| +
|
| + // The animations loop infinitely.
|
| + opacity_sequence->set_is_cyclic(true);
|
| + transform_sequence->set_is_cyclic(true);
|
| +
|
| + for (size_t i = 0; i < arraysize(kAnimationOpacity); ++i) {
|
| + opacity_sequence->AddElement(
|
| + ui::LayerAnimationElement::CreateOpacityElement(
|
| + kAnimationOpacity[i],
|
| + base::TimeDelta::FromMilliseconds(kAnimationDurationInMs)));
|
| + transform_sequence->AddElement(
|
| + ui::LayerAnimationElement::CreateTransformElement(
|
| + ui::GetScaleTransform(GetLocalBounds().CenterPoint(),
|
| + kAnimationScale[i]),
|
| + base::TimeDelta::FromMilliseconds(kAnimationDurationInMs)));
|
| + }
|
| +
|
| + ui::LayerAnimationElement::AnimatableProperties opacity_properties;
|
| + opacity_properties.insert(ui::LayerAnimationElement::OPACITY);
|
| + opacity_sequence->AddElement(
|
| + ui::LayerAnimationElement::CreatePauseElement(
|
| + opacity_properties,
|
| + base::TimeDelta::FromMilliseconds(kAnimationDurationInMs)));
|
| +
|
| + ui::LayerAnimationElement::AnimatableProperties transform_properties;
|
| + transform_properties.insert(ui::LayerAnimationElement::TRANSFORM);
|
| + transform_sequence->AddElement(
|
| + ui::LayerAnimationElement::CreatePauseElement(
|
| + transform_properties,
|
| + base::TimeDelta::FromMilliseconds(kAnimationDurationInMs)));
|
| +
|
| + std::vector<ui::LayerAnimationSequence*> animations;
|
| + // LayerAnimator::ScheduleTogether takes ownership of the sequences.
|
| + animations.push_back(opacity_sequence.release());
|
| + animations.push_back(transform_sequence.release());
|
| + layer()->GetAnimator()->ScheduleTogether(animations);
|
| +}
|
| +
|
| +void AppListButton::StopLoadingAnimation() {
|
| + layer()->GetAnimator()->StopAnimating();
|
| +
|
| + ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator());
|
| + settings.SetTransitionDuration(
|
| + base::TimeDelta::FromMilliseconds(kAnimationDurationInMs));
|
| + layer()->SetOpacity(1.0f);
|
| + layer()->SetTransform(ui::Transform());
|
| +}
|
| +
|
| bool AppListButton::OnMousePressed(const ui::MouseEvent& event) {
|
| ImageButton::OnMousePressed(event);
|
| host_->PointerPressedOnButton(this, LauncherButtonHost::MOUSE, event);
|
|
|