Hide virtual keyboard when parent access widget is shown.

This CL hides virtual keyboard when parent access widget is being
shown. It achieves this by doing the following:
1. Hide virtual keyboard when parent access widget is shown.
2. Prevent views::Textfield from calling views::Textfield::
   ShowVirtualKeyboardIfEnabled() by making changes in
   ParentAccessView::AccessCodeInput and AccessibleInputField.

Bug: 938705
Change-Id: I5199a8a6290e2cf47602b0ef130b4aa5c05b7ad9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1784337Reviewed-by: Darren Shen <shend@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693893}

ash/login/ui/parent_access_view.cc

@@ -177,6 +177,15 @@ class AccessibleInputField : public views::Textfield {
     return parent() ? parent()->GetSelectedViewForGroup(group) : nullptr;
   }
 
+  void OnGestureEvent(ui::GestureEvent* event) override {
+    if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
+      RequestFocusWithPointer(event->details().primary_pointer_type());
+      return;
+    }
+
+    views::Textfield::OnGestureEvent(event);
+  }
+
  private:
   base::string16 accessible_description_;
 
@@ -239,6 +248,22 @@ class ParentAccessView::AccessCodeInput : public views::View,
       base::RepeatingCallback<void(bool complete, bool last_field_active)>;
   using OnEnter = base::RepeatingClosure;
 
+  class TestApi {
+   public:
+    explicit TestApi(ParentAccessView::AccessCodeInput* access_code_input)
+        : access_code_input_(access_code_input) {}
+    ~TestApi() = default;
+
+    views::Textfield* GetInputTextField(int index) {
+      DCHECK_LT(static_cast<size_t>(index),
+                access_code_input_->input_fields_.size());
+      return access_code_input_->input_fields_[index];
+    }
+
+   private:
+    ParentAccessView::AccessCodeInput* access_code_input_;
+  };
+
   // Builds the view for an access code that consists out of |length| digits.
   // |on_input_change| will be called upon access code digit insertion, deletion
   // or change. True will be passed if the current code is complete (all digits
@@ -378,8 +403,10 @@ class ParentAccessView::AccessCodeInput : public views::View,
 
   bool HandleMouseEvent(views::Textfield* sender,
                         const ui::MouseEvent& mouse_event) override {
-    if (!mouse_event.IsOnlyLeftMouseButton())
+    if (!(mouse_event.IsOnlyLeftMouseButton() ||
+          mouse_event.IsOnlyRightMouseButton())) {
       return false;
+    }
 
     // Move focus to the field that was selected with mouse input.
     for (size_t i = 0; i < input_fields_.size(); ++i) {
@@ -467,34 +494,39 @@ ParentAccessView::TestApi::TestApi(ParentAccessView* view) : view_(view) {
 
 ParentAccessView::TestApi::~TestApi() = default;
 
-LoginButton* ParentAccessView::TestApi::back_button() const {
+LoginButton* ParentAccessView::TestApi::back_button() {
   return view_->back_button_;
 }
 
-views::Label* ParentAccessView::TestApi::title_label() const {
+views::Label* ParentAccessView::TestApi::title_label() {
   return view_->title_label_;
 }
 
-views::Label* ParentAccessView::TestApi::description_label() const {
+views::Label* ParentAccessView::TestApi::description_label() {
   return view_->description_label_;
 }
 
-views::View* ParentAccessView::TestApi::access_code_view() const {
+views::View* ParentAccessView::TestApi::access_code_view() {
   return view_->access_code_view_;
 }
 
-views::LabelButton* ParentAccessView::TestApi::help_button() const {
+views::LabelButton* ParentAccessView::TestApi::help_button() {
   return view_->help_button_;
 }
 
-ArrowButtonView* ParentAccessView::TestApi::submit_button() const {
+ArrowButtonView* ParentAccessView::TestApi::submit_button() {
   return view_->submit_button_;
 }
 
-LoginPinView* ParentAccessView::TestApi::pin_keyboard_view() const {
+LoginPinView* ParentAccessView::TestApi::pin_keyboard_view() {
   return view_->pin_keyboard_view_;
 }
 
+views::Textfield* ParentAccessView::TestApi::GetInputTextField(int index) {
+  return ParentAccessView::AccessCodeInput::TestApi(view_->access_code_view_)
+      .GetInputTextField(index);
+}
+
 ParentAccessView::State ParentAccessView::TestApi::state() const {
   return view_->state_;
 }
@@ -520,7 +552,6 @@ ParentAccessView::ParentAccessView(const AccountId& account_id,
       request_reason_(reason),
       validation_time_(validation_time) {
   DCHECK(callbacks.on_finished);
-
   // Main view contains all other views aligned vertically and centered.
   auto layout = std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical,

ash/login/ui/parent_access_view.h

@@ -23,6 +23,7 @@
 namespace views {
 class Label;
 class LabelButton;
+class Textfield;
 }  // namespace views
 
 namespace ash {
@@ -50,13 +51,15 @@ class ASH_EXPORT ParentAccessView : public views::DialogDelegateView,
     explicit TestApi(ParentAccessView* view);
     ~TestApi();
 
-    LoginButton* back_button() const;
-    views::Label* title_label() const;
-    views::Label* description_label() const;
-    views::View* access_code_view() const;
-    views::LabelButton* help_button() const;
-    ArrowButtonView* submit_button() const;
-    LoginPinView* pin_keyboard_view() const;
+    LoginButton* back_button();
+    views::Label* title_label();
+    views::Label* description_label();
+    views::View* access_code_view();
+    views::LabelButton* help_button();
+    ArrowButtonView* submit_button();
+    LoginPinView* pin_keyboard_view();
+
+    views::Textfield* GetInputTextField(int index);
 
     State state() const;
 

ash/login/ui/parent_access_view_unittest.cc

@@ -7,6 +7,7 @@
 #include <memory>
 #include <string>
 
+#include "ash/keyboard/keyboard_controller_impl.h"
 #include "ash/login/mock_login_screen_client.h"
 #include "ash/login/ui/arrow_button_view.h"
 #include "ash/login/ui/login_button.h"
@@ -35,6 +36,7 @@
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ -629,6 +631,35 @@ TEST_F(ParentAccessWidgetTest, WidgetResizingInTabletMode) {
   EXPECT_EQ(kClamshellModeSize, view->size());
   EXPECT_EQ(kClamshellModeSize, widget_size());
   EXPECT_EQ(user_work_area_center(), widget_center());
+  widget->Destroy();
+}
+
+TEST_F(ParentAccessViewTest, VirtualKeyboardHidden) {
+  // Enable and show virtual keyboard.
+  auto* keyboard_controller = Shell::Get()->keyboard_controller();
+  ASSERT_NE(keyboard_controller, nullptr);
+  keyboard_controller->SetEnableFlag(
+      keyboard::KeyboardEnableFlag::kCommandLineEnabled);
+
+  // Show widget.
+  ShowWidget(ParentAccessRequestReason::kUnlockTimeLimits);
+  auto* view = ParentAccessWidget::TestApi(ParentAccessWidget::Get())
+                   .parent_access_view();
+  ParentAccessView::TestApi test_api(view);
+
+  views::Textfield* text_field = test_api.GetInputTextField(0);
+
+  ui::GestureEvent event(
+      text_field->x(), text_field->y(), 0, base::TimeTicks::Now(),
+      ui::GestureEventDetails(ui::EventType::ET_GESTURE_TAP_DOWN));
+  text_field->OnGestureEvent(&event);
+  base::RunLoop().RunUntilIdle();
+
+  // Even if we have pressed the text input field, virtual keyboard shouldn't
+  // show.
+  EXPECT_FALSE(keyboard_controller->IsKeyboardVisible());
+
+  DismissWidget();
 }
 
 }  // namespace ash

ash/login/ui/parent_access_widget.cc

@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "ash/keyboard/keyboard_controller_impl.h"
 #include "ash/login/ui/parent_access_view.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/session/session_controller_impl.h"
@@ -119,6 +120,10 @@ void ParentAccessWidget::Show() {
 
   DCHECK(widget_);
   widget_->Show();
+
+  auto* keyboard_controller = Shell::Get()->keyboard_controller();
+  if (keyboard_controller && keyboard_controller->IsKeyboardEnabled())
+    keyboard_controller->HideKeyboard(HideReason::kSystem);
 }
 
 void ParentAccessWidget::OnExit(bool success) {

ui/views/controls/textfield/textfield.cc

@@ -913,28 +913,6 @@ bool Textfield::CanHandleAccelerators() const {
   return GetRenderText()->focused() && View::CanHandleAccelerators();
 }
 
-void Textfield::RequestFocusWithPointer(ui::EventPointerType pointer_type) {
-  if (HasFocus())
-    return;
-
-  switch (pointer_type) {
-    case ui::EventPointerType::POINTER_TYPE_MOUSE:
-      focus_reason_ = ui::TextInputClient::FOCUS_REASON_MOUSE;
-      break;
-    case ui::EventPointerType::POINTER_TYPE_PEN:
-      focus_reason_ = ui::TextInputClient::FOCUS_REASON_PEN;
-      break;
-    case ui::EventPointerType::POINTER_TYPE_TOUCH:
-      focus_reason_ = ui::TextInputClient::FOCUS_REASON_TOUCH;
-      break;
-    default:
-      focus_reason_ = ui::TextInputClient::FOCUS_REASON_OTHER;
-      break;
-  }
-
-  View::RequestFocus();
-}
-
 void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) {
   SelectAll(PlatformStyle::kTextfieldScrollsToStartOnFocusChange);
 }
@@ -2094,6 +2072,28 @@ bool Textfield::ShouldShowPlaceholderText() const {
   return GetText().empty() && !GetPlaceholderText().empty();
 }
 
+void Textfield::RequestFocusWithPointer(ui::EventPointerType pointer_type) {
+  if (HasFocus())
+    return;
+
+  switch (pointer_type) {
+    case ui::EventPointerType::POINTER_TYPE_MOUSE:
+      focus_reason_ = ui::TextInputClient::FOCUS_REASON_MOUSE;
+      break;
+    case ui::EventPointerType::POINTER_TYPE_PEN:
+      focus_reason_ = ui::TextInputClient::FOCUS_REASON_PEN;
+      break;
+    case ui::EventPointerType::POINTER_TYPE_TOUCH:
+      focus_reason_ = ui::TextInputClient::FOCUS_REASON_TOUCH;
+      break;
+    default:
+      focus_reason_ = ui::TextInputClient::FOCUS_REASON_OTHER;
+      break;
+  }
+
+  View::RequestFocus();
+}
+
 views::PropertyChangedSubscription Textfield::AddTextChangedCallback(
     views::PropertyChangedCallback callback) {
   return AddPropertyChangedCallback(&model_ + kTextfieldText,

ui/views/controls/textfield/textfield.h

@@ -416,6 +416,11 @@ class VIEWS_EXPORT Textfield : public View,
   // override this to customize when the placeholder text is shown.
   virtual bool ShouldShowPlaceholderText() const;
 
+ protected:
+  // Like RequestFocus, but explicitly states that the focus is triggered by
+  // a pointer event.
+  void RequestFocusWithPointer(ui::EventPointerType pointer_type);
+
  private:
   friend class TextfieldTestApi;
 
@@ -524,10 +529,6 @@ class VIEWS_EXPORT Textfield : public View,
   // Textfield::GetCaretBlinkMs().
   void OnCursorBlinkTimerFired();
 
-  // Like RequestFocus, but explicitly states that the focus is triggered by
-  // a pointer event.
-  void RequestFocusWithPointer(ui::EventPointerType pointer_type);
-
   // Returns the color to use for the FocusRing, if one is present.
   SkColor GetFocusRingColor() const;