Hide handwriting and voice buttons when keyboard is in restricted state

ash/system/ime_menu/ime_menu_tray_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/ime_menu/ime_menu_tray.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/ime/ime_controller.h"
 #include "ash/public/interfaces/ime_info.mojom.h"
 #include "ash/shell.h"
 #include "ash/system/ime_menu/ime_list_view.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/ime/chromeos/mock_input_method_manager.h"
 #include "ui/base/ime/ime_bridge.h"
 #include "ui/base/ime/text_input_flags.h"
 #include "ui/events/event.h"
 #include "ui/views/controls/label.h"
 
 using base::UTF8ToUTF16;
+using chromeos::input_method::InputMethodManager;
+using chromeos::input_method::MockInputMethodManager;
 
 namespace ash {
 namespace {
 
 ImeMenuTray* GetTray() {
   return StatusAreaWidgetTestHelper::GetStatusAreaWidget()->ime_menu_tray();
 }
 
 void SetCurrentIme(const std::string& current_ime_id,
                    const std::vector<mojom::ImeInfo>& available_imes) {
@@ skipping 18 matching lines @@
 
   // Returns the label text of the tray.
   const base::string16& GetTrayText() { return GetTray()->label_->text(); }
 
   // Returns true if the background color of the tray is active.
   bool IsTrayBackgroundActive() { return GetTray()->is_active(); }
 
   // Returns true if the IME menu bubble has been shown.
   bool IsBubbleShown() { return GetTray()->IsImeMenuBubbleShown(); }
 
+  // Returns true if emoji palatte is enabled for the current keyboard.
+  bool IsEmojiEnabled() { return GetTray()->emoji_enabled_; }
+
+  // Returns true if handwirting input is enabled for the current keyboard.
+  bool IsHandwritingEnabled() { return GetTray()->handwriting_enabled_; }
+
+  // Returns true if voice input is enabled for the current keyboard.
+  bool IsVoiceEnabled() { return GetTray()->voice_enabled_; }
+
   // Verifies the IME menu list has been updated with the right IME list.
   void ExpectValidImeList(const std::vector<mojom::ImeInfo>& expected_imes,
                           const mojom::ImeInfo& expected_current_ime) {
     const std::map<views::View*, std::string>& ime_map =
         ImeListViewTestApi(GetTray()->ime_list_view_).ime_map();
     EXPECT_EQ(expected_imes.size(), ime_map.size());
 
     std::vector<std::string> expected_ime_ids;
     for (const auto& ime : expected_imes) {
       expected_ime_ids.push_back(ime.id);
@@ skipping 217 matching lines @@
   // The virtual keyboard should be enabled.
   EXPECT_TRUE(accessibility_delegate->IsVirtualKeyboardEnabled());
 
   // Hides the keyboard.
   GetTray()->OnKeyboardHidden();
   // The keyboard should still be disabled, which is a posted task.
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(accessibility_delegate->IsVirtualKeyboardEnabled());
 }
 
-TEST_F(ImeMenuTrayTest, ShowEmojiHandwritingVoiceButtons) {
+TEST_F(ImeMenuTrayTest, ShouldShowBottomButtons) {
   FocusInInputContext(ui::TEXT_INPUT_TYPE_TEXT);
-  EXPECT_FALSE(GetTray()->ShouldShowEmojiHandwritingVoiceButtons());
+  EXPECT_FALSE(GetTray()->ShouldShowBottomButtons());
+  EXPECT_FALSE(IsEmojiEnabled());
+  EXPECT_FALSE(IsHandwritingEnabled());
+  EXPECT_FALSE(IsVoiceEnabled());
 
-  chromeos::input_method::InputMethodManager* input_method_manager =
-      chromeos::input_method::InputMethodManager::Get();
+  InputMethodManager* input_method_manager = InputMethodManager::Get();
   EXPECT_FALSE(input_method_manager);
-  chromeos::input_method::InputMethodManager::Initialize(
-      new chromeos::input_method::MockInputMethodManager);
-  input_method_manager = chromeos::input_method::InputMethodManager::Get();
+  InputMethodManager::Initialize(new MockInputMethodManager);
+  input_method_manager = InputMethodManager::Get();
   EXPECT_TRUE(input_method_manager &&
               input_method_manager->IsEmojiHandwritingVoiceOnImeMenuEnabled());
-  EXPECT_TRUE(GetTray()->ShouldShowEmojiHandwritingVoiceButtons());
+  EXPECT_TRUE(input_method_manager->GetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::NONE));

[James Cook, 2017/06/27 16:31:11]

nit: No "::FeaturesRestricted::" for plain enums.

[Azure Wei, 2017/06/29 16:37:02]

Done.

+  EXPECT_TRUE(GetTray()->ShouldShowBottomButtons());
+  EXPECT_TRUE(IsEmojiEnabled());
+  EXPECT_TRUE(IsHandwritingEnabled());
+  EXPECT_TRUE(IsVoiceEnabled());
 
   FocusInInputContext(ui::TEXT_INPUT_TYPE_PASSWORD);
-  EXPECT_FALSE(GetTray()->ShouldShowEmojiHandwritingVoiceButtons());
+  EXPECT_FALSE(GetTray()->ShouldShowBottomButtons());
+  EXPECT_FALSE(IsEmojiEnabled());
+  EXPECT_FALSE(IsHandwritingEnabled());
+  EXPECT_FALSE(IsVoiceEnabled());
+}
+
+TEST_F(ImeMenuTrayTest, ShouldShowBottomButtonsSeperate) {
+  FocusInInputContext(ui::TEXT_INPUT_TYPE_TEXT);
+  InputMethodManager* input_method_manager = InputMethodManager::Get();
+  InputMethodManager::Initialize(new MockInputMethodManager);
+  input_method_manager = InputMethodManager::Get();
+  EXPECT_TRUE(input_method_manager &&
+              input_method_manager->IsEmojiHandwritingVoiceOnImeMenuEnabled());
+
+  // Sets emoji restricted.
+  input_method_manager->SetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::EMOJI, true);
+  EXPECT_TRUE(input_method_manager->GetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::EMOJI));
+  EXPECT_TRUE(GetTray()->ShouldShowBottomButtons());
+  EXPECT_FALSE(IsEmojiEnabled());
+  EXPECT_TRUE(IsHandwritingEnabled());
+  EXPECT_TRUE(IsVoiceEnabled());
+
+  // Sets emoji not restriected, but voice and handwriting restricted.
+  input_method_manager->SetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::EMOJI, false);
+  input_method_manager->SetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::VOICE, true);
+  input_method_manager->SetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::HANDWRITING, true);
+  EXPECT_FALSE(input_method_manager->GetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::EMOJI));
+  EXPECT_TRUE(input_method_manager->GetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::VOICE));
+  EXPECT_TRUE(input_method_manager->GetFeaturesRestricted(
+      InputMethodManager::FeaturesRestricted::HANDWRITING));
+  EXPECT_TRUE(GetTray()->ShouldShowBottomButtons());
+  EXPECT_TRUE(IsEmojiEnabled());
+  EXPECT_FALSE(IsHandwritingEnabled());
+  EXPECT_FALSE(IsVoiceEnabled());
 }
 
 }  // namespace ash