Create a separate flag for inline reply on lock screen

Inline reply on lock screen is not launched at the same time as
the lock screen notifications. So this CL creates a separate feature
flag for inline reply.

Bug: b/111391270

Change-Id: I585beba17b3a491ce495f1d6c35ce46b2a6b6686
Reviewed-on: https://chromium-review.googlesource.com/1166617
Commit-Queue: Yoshiki Iguchi <yoshiki@chromium.org>
Reviewed-by: Yuichiro Hanada <yhanada@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582325}

ash/public/cpp/ash_features.cc

@@ -28,6 +28,9 @@ const base::Feature kKeyboardShortcutViewerApp{
 const base::Feature kLockScreenNotifications{"LockScreenNotifications",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kLockScreenInlineReply{"LockScreenInlineReply",
+                                           base::FEATURE_DISABLED_BY_DEFAULT};
+
 const base::Feature kLockScreenHideSensitiveNotificationsSupport{
     "LockScreenHideSensitiveNotificationsSupport",
     base::FEATURE_ENABLED_BY_DEFAULT};
@@ -67,6 +70,10 @@ bool IsLockScreenNotificationsEnabled() {
   return base::FeatureList::IsEnabled(kLockScreenNotifications);
 }
 
+bool IsLockScreenInlineReplyEnabled() {
+  return base::FeatureList::IsEnabled(kLockScreenInlineReply);
+}
+
 bool IsLockScreenHideSensitiveNotificationsSupported() {
   return base::FeatureList::IsEnabled(
       kLockScreenHideSensitiveNotificationsSupport);

ash/public/cpp/ash_features.h

@@ -39,6 +39,10 @@ ASH_PUBLIC_EXPORT extern const base::Feature kKeyboardShortcutViewerApp;
 // Enables notifications on the lock screen.
 ASH_PUBLIC_EXPORT extern const base::Feature kLockScreenNotifications;
 
+// Enables inline reply on notifications on the lock screen.
+// This option is effective when |kLockScreenNotification| is enabled.
+ASH_PUBLIC_EXPORT extern const base::Feature kLockScreenInlineReply;
+
 // Supports the feature to hide sensitive content in notifications on the lock
 // screen. This option is effective when |kLockScreenNotification| is enabled.
 ASH_PUBLIC_EXPORT extern const base::Feature
@@ -77,6 +81,8 @@ ASH_PUBLIC_EXPORT bool IsKeyboardShortcutViewerAppEnabled();
 
 ASH_PUBLIC_EXPORT bool IsLockScreenNotificationsEnabled();
 
+ASH_PUBLIC_EXPORT bool IsLockScreenInlineReplyEnabled();
+
 ASH_PUBLIC_EXPORT bool IsLockScreenHideSensitiveNotificationsSupported();
 
 ASH_PUBLIC_EXPORT bool IsNewWallpaperPickerEnabled();

chrome/browser/chromeos/input_method/input_method_manager_impl.cc

@@ -329,7 +329,7 @@ void InputMethodManagerImpl::StateImpl::EnableLockScreenLayouts() {
     // Skip if it's not a keyboard layout. Drop input methods including
     // extension ones. We need to keep all IMEs to support inputting on inline
     // reply on a notification if notifications on lock screen is enabled.
-    if ((!ash::features::IsLockScreenNotificationsEnabled() &&
+    if ((!ash::features::IsLockScreenInlineReplyEnabled() &&
          !manager_->IsLoginKeyboard(input_method_id)) ||
         added_ids.count(input_method_id)) {
       continue;