Commit 4a6fd768 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot

assistant: launcher button respect mic pref

Bug: 997734
Test: build and run locally
Change-Id: I718c136f2c7a070cd44469d250a9b5f7f5a3c578
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832615Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701367}
parent e3da394f
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include "ash/assistant/util/assistant_util.h" #include "ash/assistant/util/assistant_util.h"
#include <string>
#include "ash/assistant/model/assistant_ui_model.h" #include "ash/assistant/model/assistant_ui_model.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/system/sys_info.h" #include "base/system/sys_info.h"
...@@ -44,8 +46,8 @@ bool IsFinishingSession(AssistantVisibility new_visibility) { ...@@ -44,8 +46,8 @@ bool IsFinishingSession(AssistantVisibility new_visibility) {
bool IsVoiceEntryPoint(AssistantEntryPoint entry_point, bool prefer_voice) { bool IsVoiceEntryPoint(AssistantEntryPoint entry_point, bool prefer_voice) {
switch (entry_point) { switch (entry_point) {
case AssistantEntryPoint::kHotword: case AssistantEntryPoint::kHotword:
case AssistantEntryPoint::kLauncherSearchBoxMic:
return true; return true;
case AssistantEntryPoint::kLauncherSearchBoxMic:
case AssistantEntryPoint::kHotkey: case AssistantEntryPoint::kHotkey:
case AssistantEntryPoint::kLauncherSearchBox: case AssistantEntryPoint::kLauncherSearchBox:
case AssistantEntryPoint::kLongPressLauncher: case AssistantEntryPoint::kLongPressLauncher:
......
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