Commit 0654e790 authored by wutao's avatar wutao Committed by Commit Bot

Assistant: Change dots to mic animation

The transition animation of Logo view from dots to mic should be to
kMic state, not kMicFab state.
The difference is that there is a big jump of the dots to kMic state,
which is consistent to Android implementation.

Bug: b/117184159
Test: manual.
Change-Id: Id7ba2fedf683d809d096cdeb644214db92b0f7b9
Reviewed-on: https://chromium-review.googlesource.com/c/1258605Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596474}
parent 270f4a68
...@@ -101,7 +101,7 @@ void ActionView::UpdateState(bool animate) { ...@@ -101,7 +101,7 @@ void ActionView::UpdateState(bool animate) {
BaseLogoView::State mic_state; BaseLogoView::State mic_state;
switch (interaction_model->mic_state()) { switch (interaction_model->mic_state()) {
case MicState::kClosed: case MicState::kClosed:
mic_state = BaseLogoView::State::kMicFab; mic_state = BaseLogoView::State::kMic;
break; break;
case MicState::kOpen: case MicState::kOpen:
mic_state = is_user_speaking_ ? BaseLogoView::State::kUserSpeaks mic_state = is_user_speaking_ ? BaseLogoView::State::kUserSpeaks
......
...@@ -15,7 +15,7 @@ class BaseLogoView : public views::View { ...@@ -15,7 +15,7 @@ class BaseLogoView : public views::View {
enum class State { enum class State {
kUndefined, kUndefined,
kListening, kListening,
kMicFab, kMic,
kMoleculeWavy, kMoleculeWavy,
kUserSpeaks, kUserSpeaks,
}; };
......
...@@ -58,8 +58,8 @@ void LogoView::SetState(BaseLogoView::State state, bool animate) { ...@@ -58,8 +58,8 @@ void LogoView::SetState(BaseLogoView::State state, bool animate) {
case BaseLogoView::State::kListening: case BaseLogoView::State::kListening:
animator_state = StateModel::State::kListening; animator_state = StateModel::State::kListening;
break; break;
case BaseLogoView::State::kMicFab: case BaseLogoView::State::kMic:
animator_state = StateModel::State::kMicFab; animator_state = StateModel::State::kMic;
break; break;
case BaseLogoView::State::kMoleculeWavy: case BaseLogoView::State::kMoleculeWavy:
animator_state = StateModel::State::kMoleculeWavy; animator_state = StateModel::State::kMoleculeWavy;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment