Issue 105773004: Introduces the speech recognition UI to app_list.

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+723 lines, -103 lines)			Patch
M	ash/shell/app_list.cc	View	1 2 3	3 chunks	+6 lines, -0 lines	0 comments	Download
M	chrome/app/generated_resources.grd	View		1 chunk	+0 lines, -3 lines	0 comments	Download
M	chrome/browser/resources/app_list/speech_manager.js	View	1 2 3	5 chunks	+21 lines, -10 lines	0 comments	Download
M	chrome/browser/resources/app_list/speech_recognition_manager.js	View		1 chunk	+4 lines, -0 lines	0 comments	Download
M	chrome/browser/ui/app_list/app_list_view_delegate.h	View	1 2 3 4 5	4 chunks	+9 lines, -2 lines	0 comments	Download
M	chrome/browser/ui/app_list/app_list_view_delegate.cc	View	1 2 3 4 5	3 chunks	+17 lines, -4 lines	0 comments	Download
M	chrome/browser/ui/app_list/search/search_controller.cc	View	1	1 chunk	+3 lines, -8 lines	0 comments	Download
M	chrome/browser/ui/app_list/start_page_observer.h	View	1 2 3	1 chunk	+8 lines, -4 lines	0 comments	Download
M	chrome/browser/ui/app_list/start_page_service.h	View	1 2 3	2 chunks	+4 lines, -2 lines	0 comments	Download
M	chrome/browser/ui/app_list/start_page_service.cc	View		1 chunk	+14 lines, -4 lines	0 comments	Download
M	chrome/browser/ui/webui/app_list/start_page_handler.h	View		1 chunk	+2 lines, -1 line	0 comments	Download
M	chrome/browser/ui/webui/app_list/start_page_handler.cc	View	1 2 3	3 chunks	+31 lines, -7 lines	0 comments	Download
M	ui/app_list/app_list.gyp	View	1 2 3 4 5 6 7 8 9 10	2 chunks	+5 lines, -0 lines	0 comments	Download
M	ui/app_list/app_list_view_delegate.h	View	1 2 3 4 5	2 chunks	+4 lines, -0 lines	0 comments	Download
M	ui/app_list/cocoa/apps_search_box_controller.mm	View	1 2 3 4 5 6	2 chunks	+0 lines, -7 lines	0 comments	Download
M	ui/app_list/search_box_model.h	View	1	3 chunks	+7 lines, -18 lines	0 comments	Download
M	ui/app_list/search_box_model.cc	View	1	2 chunks	+5 lines, -15 lines	0 comments	Download
M	ui/app_list/search_box_model_observer.h	View	1	1 chunk	+0 lines, -3 lines	0 comments	Download
A	ui/app_list/speech_ui_model.h	View	1 2 3 4	1 chunk	+47 lines, -0 lines	0 comments	Download
A	ui/app_list/speech_ui_model.cc	View	1 2 3	1 chunk	+54 lines, -0 lines	0 comments	Download
A	ui/app_list/speech_ui_model_observer.h	View	1 2 3	1 chunk	+39 lines, -0 lines	0 comments	Download
M	ui/app_list/test/app_list_test_view_delegate.h	View	1 2 3 4 5	3 chunks	+3 lines, -0 lines	0 comments	Download
M	ui/app_list/test/app_list_test_view_delegate.cc	View	1 2 3 4 5	1 chunk	+4 lines, -0 lines	0 comments	Download
M	ui/app_list/views/app_list_view.h	View	1 2 3 4 5 6 7 8 9 10	3 chunks	+11 lines, -1 line	0 comments	Download
M	ui/app_list/views/app_list_view.cc	View	1 2 3 4 5 6 7 8 9 10	6 chunks	+127 lines, -1 line	0 comments	Download
M	ui/app_list/views/search_box_view.h	View	1	2 chunks	+1 line, -2 lines	0 comments	Download
M	ui/app_list/views/search_box_view.cc	View	1	2 chunks	+2 lines, -10 lines	0 comments	Download
A	ui/app_list/views/speech_view.h	View	1 2 3	1 chunk	+64 lines, -0 lines	0 comments	Download
A	ui/app_list/views/speech_view.cc	View	1 2 3	1 chunk	+227 lines, -0 lines	0 comments	Download
M	ui/base/strings/ui_strings.grd	View		1 chunk	+4 lines, -1 line	0 comments	Download

Messages

Total messages: 19 (0 generated)

Expand Messages | Collapse Messages

xiyuan

https://codereview.chromium.org/105773004/diff/40001/chrome/browser/resources/app_list/speech_manager.js File chrome/browser/resources/app_list/speech_manager.js (right): https://codereview.chromium.org/105773004/diff/40001/chrome/browser/resources/app_list/speech_manager.js#newcode140 chrome/browser/resources/app_list/speech_manager.js:140: console.log('speechStarted: ' + this.state); nit: remove debugging log? https://codereview.chromium.org/105773004/diff/40001/chrome/browser/resources/app_list/speech_manager.js#newcode149 ...

7 years ago (2013-12-05 22:06:29 UTC) #2

Jun Mukai

7 years ago (2013-12-06 00:31:10 UTC) #3

xiyuan

LGTM Awesome work. :) https://codereview.chromium.org/105773004/diff/60001/ui/app_list/speech_ui_model.h File ui/app_list/speech_ui_model.h (right): https://codereview.chromium.org/105773004/diff/60001/ui/app_list/speech_ui_model.h#newcode41 ui/app_list/speech_ui_model.h:41: }; nit: DISALLOW_COPY_AND_ASSIGN

7 years ago (2013-12-06 01:42:59 UTC) #4

Jun Mukai

https://codereview.chromium.org/105773004/diff/60001/ui/app_list/speech_ui_model.h File ui/app_list/speech_ui_model.h (right): https://codereview.chromium.org/105773004/diff/60001/ui/app_list/speech_ui_model.h#newcode41 ui/app_list/speech_ui_model.h:41: }; On 2013/12/06 01:42:59, xiyuan wrote: > nit: DISALLOW_COPY_AND_ASSIGN ...

7 years ago (2013-12-06 01:55:37 UTC) #5

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mukai@chromium.org/105773004/80001

7 years ago (2013-12-06 02:58:41 UTC) #8

xiyuan

Can CQ handle binary files now? I thought we need to manually dcommit the binary ...

7 years ago (2013-12-06 05:07:36 UTC) #9

commit-bot: I haz the power

Retried try job too often on mac_rel for step(s) app_list_unittests, cacheinvalidation_unittests, cc_unittests, check_deps, chromedriver2_unittests, components_unittests, ...

7 years ago (2013-12-06 06:05:19 UTC) #10

Jun Mukai

I thought the image support of rietveld meant that CQ also supports them, but it ...

7 years ago (2013-12-06 19:10:24 UTC) #11

oshima

On 2013/12/06 19:10:24, Jun Mukai wrote: > I thought the image support of rietveld meant ...

7 years ago (2013-12-06 20:26:38 UTC) #12

Jun Mukai

On 2013/12/06 20:26:38, oshima wrote: > On 2013/12/06 19:10:24, Jun Mukai wrote: > > I ...

7 years ago (2013-12-06 22:40:31 UTC) #13

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mukai@chromium.org/105773004/180001

7 years ago (2013-12-06 23:31:06 UTC) #14

commit-bot: I haz the power

The commit queue went berserk retrying too often for a seemingly flaky test on builder ...

7 years ago (2013-12-07 15:13:59 UTC) #15

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mukai@chromium.org/105773004/180001

7 years ago (2013-12-07 19:13:29 UTC) #16

commit-bot: I haz the power

Failed to apply patch for ui/app_list/views/app_list_view.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

7 years ago (2013-12-07 19:13:47 UTC) #17

Failed to apply patch for ui/app_list/views/app_list_view.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/app_list/views/app_list_view.cc
  Hunk #1 FAILED at 11.
  Hunk #2 succeeded at 43 (offset 1 line).
  Hunk #3 succeeded at 75 (offset 1 line).
  Hunk #4 succeeded at 260 (offset 1 line).
  Hunk #5 succeeded at 363 (offset 1 line).
  Hunk #6 succeeded at 407 (offset 1 line).
  1 out of 6 hunks FAILED -- saving rejects to file
ui/app_list/views/app_list_view.cc.rej

Patch:       ui/app_list/views/app_list_view.cc
Index: ui/app_list/views/app_list_view.cc
diff --git a/ui/app_list/views/app_list_view.cc
b/ui/app_list/views/app_list_view.cc
index
8166e212a64436cf8cceb100477f1e50ddf9e21a..e0a2b64719c8e3204581fa58d0dba10d4656e274
100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -11,11 +11,15 @@
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/signin_delegate.h"
+#include "ui/app_list/speech_ui_model.h"
 #include "ui/app_list/views/app_list_background.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/signin_view.h"
+#include "ui/app_list/views/speech_view.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/compositor/layer.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
@@ -42,6 +46,12 @@ namespace {
 
 void (*g_next_paint_callback)();
 
+// The margin from the edge to the speech UI.
+const int kSpeechUIMargin = 12;
+
+// The vertical position for the appearing animation of the speech UI.
+const float kSpeechUIApearingPosition =12;
+
 // The distance between the arrow tip and edge of the anchor view.
 const int kArrowOffset = 10;
 
@@ -68,19 +78,56 @@ bool SupportsShadow() {
 
 }  // namespace
 
+// An animation observer to hide the view at the end of the animation.
+class HideViewAnimationObserver : public ui::ImplicitAnimationObserver {
+ public:
+  HideViewAnimationObserver() : target_(NULL) {
+  }
+
+  virtual ~HideViewAnimationObserver() {
+    if (target_)
+      StopObservingImplicitAnimations();
+  }
+
+  void SetTarget(views::View* target) {
+    if (!target_)
+      StopObservingImplicitAnimations();
+    target_ = target;
+  }
+
+ private:
+  // Overridden from ui::ImplicitAnimationObserver:
+  virtual void OnImplicitAnimationsCompleted() OVERRIDE {
+    if (target_) {
+      target_->SetVisible(false);
+      target_ = NULL;
+    }
+  }
+
+  views::View* target_;
+
+  DISALLOW_COPY_AND_ASSIGN(HideViewAnimationObserver);
+};
+

////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(NULL),
-      signin_view_(NULL) {
+      signin_view_(NULL),
+      speech_view_(NULL),
+      animation_observer_(new HideViewAnimationObserver()) {
   CHECK(delegate);
+
   delegate_->AddObserver(this);
+  delegate_->GetSpeechUI()->AddObserver(this);
 }
 
 AppListView::~AppListView() {
+  delegate_->GetSpeechUI()->RemoveObserver(this);
   delegate_->RemoveObserver(this);
+  animation_observer_.reset();
   // Remove child views first to ensure no remaining dependencies on delegate_.
   RemoveAllChildViews(true);
 }
@@ -216,6 +263,18 @@ void AppListView::InitAsBubbleInternal(gfx::NativeView
parent,
                      app_list_main_view_->GetPreferredSize().width());
   AddChildView(signin_view_);
 
+  // Speech recognition is available only when the start page exists.
+  if (delegate_ && delegate_->GetStartPageContents()) {
+    speech_view_ = new SpeechView(delegate_.get());
+    speech_view_->SetVisible(false);
+#if defined(USE_AURA)
+    speech_view_->SetPaintToLayer(true);
+    speech_view_->SetFillsBoundsOpaquely(false);
+    speech_view_->layer()->SetOpacity(0.0f);
+#endif
+    AddChildView(speech_view_);
+  }
+
   OnProfilesChanged();
   set_color(kContentsBackgroundColor);
   set_margins(gfx::Insets());
@@ -307,6 +366,16 @@ void AppListView::Layout() {
   const gfx::Rect contents_bounds = GetContentsBounds();
   app_list_main_view_->SetBoundsRect(contents_bounds);
   signin_view_->SetBoundsRect(contents_bounds);
+
+  if (speech_view_) {
+    gfx::Rect speech_bounds = contents_bounds;
+    int preferred_height = speech_view_->GetPreferredSize().height();
+    speech_bounds.Inset(kSpeechUIMargin, kSpeechUIMargin);
+    speech_bounds.set_height(std::min(speech_bounds.height(),
+                                      preferred_height));
+    speech_bounds.Inset(-speech_view_->GetInsets());
+    speech_view_->SetBoundsRect(speech_bounds);
+  }
 }
 
 void AppListView::OnWidgetDestroying(views::Widget* widget) {
@@ -341,4 +410,61 @@ void AppListView::OnWidgetVisibilityChanged(views::Widget*
widget,
   Layout();
 }
 
+void AppListView::OnSpeechRecognitionStateChanged(
+    SpeechRecognitionState new_state) {
+  DCHECK(!signin_view_->visible());
+
+  bool recognizing = new_state != SPEECH_RECOGNITION_NOT_STARTED;
+  // No change for this class.
+  if (speech_view_->visible() == recognizing)
+    return;
+
+  if (recognizing)
+    speech_view_->Reset();
+
+#if defined(USE_AURA)
+  gfx::Transform speech_transform;
+  speech_transform.Translate(
+      0, SkFloatToMScalar(kSpeechUIApearingPosition));
+  if (recognizing)
+    speech_view_->layer()->SetTransform(speech_transform);
+
+  {
+    ui::ScopedLayerAnimationSettings main_settings(
+        app_list_main_view_->layer()->GetAnimator());
+    if (recognizing) {
+      animation_observer_->SetTarget(app_list_main_view_);
+      main_settings.AddObserver(animation_observer_.get());
+    }
+    app_list_main_view_->layer()->SetOpacity(recognizing ? 0.0f : 1.0f);
+  }
+
+  {
+    ui::ScopedLayerAnimationSettings speech_settings(
+        speech_view_->layer()->GetAnimator());
+    if (!recognizing) {
+      animation_observer_->SetTarget(speech_view_);
+      speech_settings.AddObserver(animation_observer_.get());
+    }
+
+    speech_view_->layer()->SetOpacity(recognizing ? 1.0f : 0.0f);
+    if (recognizing)
+      speech_view_->layer()->SetTransform(gfx::Transform());
+    else
+      speech_view_->layer()->SetTransform(speech_transform);
+  }
+
+  if (recognizing)
+    speech_view_->SetVisible(true);
+  else
+    app_list_main_view_->SetVisible(true);
+#else
+  speech_view_->SetVisible(recognizing);
+  app_list_main_view_->SetVisible(!recognizing);
+#endif
+
+  // Needs to schedule paint of AppListView itself, to repaint the background.
+  SchedulePaint();
+}
+
 }  // namespace app_list

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mukai@chromium.org/105773004/200001

7 years ago (2013-12-07 19:26:25 UTC) #18

Message was sent while issue was closed.

Change committed as 239413

Expand Messages | Collapse Messages

Issue 105773004: Introduces the speech recognition UI to app_list. (Closed)

Description

Patch Set 1 #

Patch Set 2 : button state #

Patch Set 3 : start_page existence #

Patch Set 4 : fix #

Patch Set 5 : fix #

Patch Set 6 : rebase #

Patch Set 7 : mac fix #

Patch Set 8 : cleanup for rebase #

Patch Set 9 : re-upload #

Patch Set 10 : image resources #

Patch Set 11 : rebase #

Messages