Update voice interaction burst animation

ash/shelf/app_list_button.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 "ash/shelf/app_list_button.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/public/cpp/shelf_types.h"
@@ skipping 27 matching lines @@
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace {
 constexpr int kVoiceInteractionAnimationDelayMs = 200;
+constexpr int kVoiceInteractionAnimationHideDelayMs = 500;
 }  // namespace
 
 constexpr uint8_t kVoiceInteractionRunningAlpha = 255;     // 100% alpha
 constexpr uint8_t kVoiceInteractionNotRunningAlpha = 138;  // 54% alpha
 
 AppListButton::AppListButton(InkDropButtonListener* listener,
                              ShelfView* shelf_view,
                              Shelf* shelf)
     : views::ImageButton(nullptr),
       is_showing_app_list_(false),
@@ skipping 12 matching lines @@
       l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE));
   SetSize(gfx::Size(kShelfSize, kShelfSize));
   SetFocusPainter(TrayPopupUtils::CreateFocusPainter());
   set_notify_action(CustomButton::NOTIFY_ON_PRESS);
 
   if (chromeos::switches::IsVoiceInteractionEnabled()) {
     voice_interaction_overlay_ = new VoiceInteractionOverlay(this);
     AddChildView(voice_interaction_overlay_);
     voice_interaction_overlay_->SetVisible(false);
     voice_interaction_animation_delay_timer_.reset(new base::OneShotTimer());
+    voice_interaction_animation_hide_delay_timer_.reset(
+        new base::OneShotTimer());
   } else {
     voice_interaction_overlay_ = nullptr;
   }
 }
 
 AppListButton::~AppListButton() {
   Shell::Get()->RemoveShellObserver(this);
   if (voice_interaction_animation_delay_timer_)
     voice_interaction_animation_delay_timer_->Stop();
+  if (voice_interaction_animation_hide_delay_timer_)
+    voice_interaction_animation_hide_delay_timer_->Stop();

[oshima, 2017/07/06 19:23:54]

just curious. Timer's dtor automatically abandon the scheduled tasks and stop
the time. Did you need these?

[xiaohuic, 2017/07/06 20:55:41]

Maybe I don't, removed.

 }
 
 void AppListButton::OnAppListShown() {
   AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr);
   is_showing_app_list_ = true;
   shelf_->UpdateAutoHideState();
 }
 
 void AppListButton::OnAppListDismissed() {
   AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
@@ skipping 29 matching lines @@
         voice_interaction_animation_delay_timer_->Stop();
       }
       ImageButton::OnGestureEvent(event);
       return;
     case ui::ET_GESTURE_TAP_DOWN:
       if (voice_interaction_overlay_) {
         voice_interaction_animation_delay_timer_->Start(
             FROM_HERE,
             base::TimeDelta::FromMilliseconds(
                 kVoiceInteractionAnimationDelayMs),
-            base::Bind(&VoiceInteractionOverlay::StartAnimation,
-                       base::Unretained(voice_interaction_overlay_)));
+            base::Bind(&AppListButton::StartVoiceInteractionAnimation,
+                       base::Unretained(this)));
       }
       if (!Shell::Get()->IsAppListVisible())
         AnimateInkDrop(views::InkDropState::ACTION_PENDING, event);
       ImageButton::OnGestureEvent(event);
       return;
     case ui::ET_GESTURE_LONG_PRESS:
       if (chromeos::switches::IsVoiceInteractionEnabled()) {
         base::RecordAction(base::UserMetricsAction(
             "VoiceInteraction.Started.AppListButtonLongPress"));
         Shell::Get()->app_list()->StartVoiceInteractionSession();
@@ skipping 163 matching lines @@
 
   if (shown)
     OnAppListShown();
   else
     OnAppListDismissed();
 }
 
 void AppListButton::OnVoiceInteractionStatusChanged(bool running) {
   voice_interaction_running_ = running;
   SchedulePaint();
+
+  // Voice interaction window shows up, we start hiding the animation if it is
+  // running.
+  if (running && voice_interaction_overlay_->IsBursting()) {
+    voice_interaction_animation_hide_delay_timer_->Start(
+        FROM_HERE,
+        base::TimeDelta::FromMilliseconds(
+            kVoiceInteractionAnimationHideDelayMs),
+        base::Bind(&VoiceInteractionOverlay::HideAnimation,
+                   base::Unretained(voice_interaction_overlay_)));
+  }
+}
+
+void AppListButton::StartVoiceInteractionAnimation() {
+  // We only show the voice interaction icon and related animation when the
+  // shelf is at the bottom position and voice interaction is not running.
+  ShelfAlignment alignment = shelf_->alignment();
+  bool show_icon = (alignment == SHELF_ALIGNMENT_BOTTOM ||
+                    alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) &&
+                   !voice_interaction_running_;
+  voice_interaction_overlay_->StartAnimation(show_icon);
 }
 
 }  // namespace ash