add function to set voice interaction status.

BUG=b:62705237
TEST=manually start stop voice interaciton.

Review-Url: https://codereview.chromium.org/2946193002
Cr-Commit-Position: refs/heads/master@{#482376}

ash/app_list/app_list_delegate_impl.cc

@@ -24,7 +24,7 @@ void AppListDelegateImpl::OnAppListVisibilityChanged(bool visible,
   if (app_list::features::IsFullscreenAppListEnabled()) {
     aura::Window* root_window =
         Shell::Get()->GetRootWindowForDisplayId(display_id);
-    Shell::Get()->OnAppListVisibilityChanged(visible, root_window);
+    Shell::Get()->NotifyAppListVisibilityChanged(visible, root_window);
   }
 }
 

ash/app_list/app_list_presenter_delegate.cc

@@ -136,7 +136,7 @@ void AppListPresenterDelegate::Init(app_list::AppListView* view,
 void AppListPresenterDelegate::OnShown(int64_t display_id) {
   is_visible_ = true;
   aura::Window* root_window = Shell::GetRootWindowForDisplayId(display_id);
-  Shell::Get()->OnAppListVisibilityChanged(is_visible_, root_window);
+  Shell::Get()->NotifyAppListVisibilityChanged(is_visible_, root_window);
 }
 
 void AppListPresenterDelegate::OnDismissed() {
@@ -146,7 +146,7 @@ void AppListPresenterDelegate::OnDismissed() {
   is_visible_ = false;
   aura::Window* root_window =
       RootWindowController::ForTargetRootWindow()->GetRootWindow();
-  Shell::Get()->OnAppListVisibilityChanged(is_visible_, root_window);
+  Shell::Get()->NotifyAppListVisibilityChanged(is_visible_, root_window);
 }
 
 void AppListPresenterDelegate::UpdateBounds() {

ash/shelf/app_list_button.cc

@@ -43,6 +43,9 @@
 
 namespace ash {
 
+constexpr uint8_t kVoiceInteractionRunningAlpha = 255;     // 100% alpha
+constexpr uint8_t kVoiceInteractionNotRunningAlpha = 138;  // 54% alpha
+
 AppListButton::AppListButton(InkDropButtonListener* listener,
                              ShelfView* shelf_view,
                              Shelf* shelf)
@@ -245,13 +248,21 @@ void AppListButton::PaintButtonContents(gfx::Canvas* canvas) {
     fg_flags.setAntiAlias(true);
     fg_flags.setStyle(cc::PaintFlags::kStroke_Style);
     fg_flags.setColor(kShelfIconColor);
+
+    if (chromeos::switches::IsVoiceInteractionEnabled())
+      // active: 100% alpha, inactive: 54% alpha
+      fg_flags.setAlpha(voice_interaction_running_
+                            ? kVoiceInteractionRunningAlpha
+                            : kVoiceInteractionNotRunningAlpha);
+
     const float thickness = std::ceil(ring_thickness_dp * dsf);
     const float radius = std::ceil(ring_outer_radius_dp * dsf) - thickness / 2;
     fg_flags.setStrokeWidth(thickness);
     // Make sure the center of the circle lands on pixel centers.
     canvas->DrawCircle(circle_center, radius, fg_flags);
 
     if (chromeos::switches::IsVoiceInteractionEnabled()) {
+      fg_flags.setAlpha(255);
       const float kCircleRadiusDp = 5.f;
       fg_flags.setStyle(cc::PaintFlags::kFill_Style);
       canvas->DrawCircle(circle_center, std::ceil(kCircleRadiusDp * dsf),
@@ -291,4 +302,9 @@ void AppListButton::OnAppListVisibilityChanged(bool shown,
     OnAppListDismissed();
 }
 
+void AppListButton::OnVoiceInteractionStatusChanged(bool running) {
+  voice_interaction_running_ = running;
+  SchedulePaint();
+}
+
 }  // namespace ash

ash/shelf/app_list_button.h

@@ -61,6 +61,7 @@ class ASH_EXPORT AppListButton : public views::ImageButton,
   // ShellObserver overrides:
   void OnAppListVisibilityChanged(bool shown,
                                   aura::Window* root_window) override;
+  void OnVoiceInteractionStatusChanged(bool running) override;
 
   // True if the app list is currently showing for this display.
   // This is useful because other IsApplistVisible functions aren't per-display.
@@ -75,6 +76,8 @@ class ASH_EXPORT AppListButton : public views::ImageButton,
 
   VoiceInteractionOverlay* voice_interaction_overlay_;
 
+  bool voice_interaction_running_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(AppListButton);
 };
 

ash/shell.cc

@@ -566,12 +566,17 @@ void Shell::SetIsBrowserProcessWithMash() {
   g_is_browser_process_with_mash = true;
 }
 
-void Shell::OnAppListVisibilityChanged(bool visible,
-                                       aura::Window* root_window) {
+void Shell::NotifyAppListVisibilityChanged(bool visible,
+                                           aura::Window* root_window) {
   for (auto& observer : shell_observers_)
     observer.OnAppListVisibilityChanged(visible, root_window);
 }
 
+void Shell::NotifyVoiceInteractionStatusChanged(bool running) {
+  for (auto& observer : shell_observers_)
+    observer.OnVoiceInteractionStatusChanged(running);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 

ash/shell.h

@@ -598,7 +598,9 @@ class ASH_EXPORT Shell : public SessionObserver,
   // Used to provide better error messages for Shell::Get() under mash.
   static void SetIsBrowserProcessWithMash();
 
-  void OnAppListVisibilityChanged(bool visible, aura::Window* root_window);
+  void NotifyAppListVisibilityChanged(bool visible, aura::Window* root_window);
+
+  void NotifyVoiceInteractionStatusChanged(bool running);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);

ash/shell_observer.h

@@ -70,6 +70,9 @@ class ASH_EXPORT ShellObserver {
   // Called when a new KeyboardController is created.
   virtual void OnKeyboardControllerCreated() {}
 
+  // Called when voice interaction session starts / finishes.
+  virtual void OnVoiceInteractionStatusChanged(bool running) {}
+
   // Called at the end of Shell::Init.
   virtual void OnShellInitialized() {}
 

chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc

@@ -273,6 +273,11 @@ void ArcVoiceInteractionFrameworkService::CaptureFullscreen(
                  base::Passed(std::move(old_layer_owner))));
 }
 
+void ArcVoiceInteractionFrameworkService::SetVoiceInteractionRunning(
+    bool running) {
+  ash::Shell::Get()->NotifyVoiceInteractionStatusChanged(running);
+}
+
 void ArcVoiceInteractionFrameworkService::OnMetalayerClosed() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   CallAndResetMetalayerCallback();

chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h

@@ -54,6 +54,7 @@ class ArcVoiceInteractionFrameworkService
   void CaptureFullscreen(const CaptureFullscreenCallback& callback) override;
   void OnMetalayerClosed() override;
   void SetMetalayerEnabled(bool enabled) override;
+  void SetVoiceInteractionRunning(bool running) override;
 
   bool IsMetalayerSupported();
   void ShowMetalayer(const base::Closure& closed);

components/arc/common/voice_interaction_framework.mojom

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Next MinVersion: 6
+// Next MinVersion: 7
 
 module arc.mojom;
 
 import "screen_rect.mojom";
 
 // Handles voice interaction queries from Android.
-// Next method ID: 4
+// Next method ID: 5
 interface VoiceInteractionFrameworkHost {
   // Returns a screenshot of currently focused window or empty array if
   // no window is focused. |data| represents the image encoded in JPEG
@@ -25,6 +25,9 @@ interface VoiceInteractionFrameworkHost {
 
   // Enables/disables screenshot taking.
   [MinVersion=3]SetMetalayerEnabled@3(bool enabled);
+
+  // Notifies Chrome whether voice interaction session is running.
+  [MinVersion=6]SetVoiceInteractionRunning@4(bool running);
 };
 
 // Connects with Android system server.