Commit 55517958 authored by Megumi Hattori's avatar Megumi Hattori Committed by Commit Bot

Enable IME on lock screen behind flag, enable-lock-screen-notification.

This CL enables IME on lock screen behind flag,
--enable-lock-screen-notification, in order to enable input of languages
other than English in the inline reply on notifications.

BUG=823184
TEST=manual

Change-Id: I820e70855be414756d2d4f0ee9e90ee92edb2c3c
Reviewed-on: https://chromium-review.googlesource.com/966248
Commit-Queue: Megumi Hattori <megumihattori@google.com>
Reviewed-by: default avatarYuichiro Hanada <yhanada@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543968}
parent 0108cbbc
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include "ash/public/cpp/ash_features.h"
#include "ash/public/interfaces/ime_info.mojom.h" #include "ash/public/interfaces/ime_info.mojom.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/feature_list.h" #include "base/feature_list.h"
...@@ -314,8 +315,10 @@ void InputMethodManagerImpl::StateImpl::EnableLockScreenLayouts() { ...@@ -314,8 +315,10 @@ void InputMethodManagerImpl::StateImpl::EnableLockScreenLayouts() {
for (size_t i = 0; i < active_input_method_ids.size(); ++i) { for (size_t i = 0; i < active_input_method_ids.size(); ++i) {
const std::string& input_method_id = active_input_method_ids[i]; const std::string& input_method_id = active_input_method_ids[i];
// Skip if it's not a keyboard layout. Drop input methods including // Skip if it's not a keyboard layout. Drop input methods including
// extension ones. // extension ones. We need to keep all IMEs to support inputting on inline
if (!manager_->IsLoginKeyboard(input_method_id) || // reply on a notification if notifications on lock screen is enabled.
if ((!ash::features::IsLockScreenNotificationsEnabled() &&
!manager_->IsLoginKeyboard(input_method_id)) ||
added_ids.count(input_method_id)) { added_ids.count(input_method_id)) {
continue; continue;
} }
......
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