Virtual keyboard - do not change work area of screen if in non-sticky mode.

ash/wm/workspace/workspace_layout_manager_unittest.cc

 // Copyright (c) 2012 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/common/wm/workspace/workspace_layout_manager.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/workspace/workspace_window_resizer.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
+#include "ui/keyboard/keyboard_controller.h"
+#include "ui/keyboard/keyboard_ui.h"
+#include "ui/keyboard/keyboard_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace {
 
 class MaximizeDelegateView : public views::WidgetDelegateView {
  public:
   explicit MaximizeDelegateView(const gfx::Rect& initial_bounds)
@@ skipping 1009 matching lines @@
  public:
   WorkspaceLayoutManagerKeyboardTest() : layout_manager_(nullptr) {}
   ~WorkspaceLayoutManagerKeyboardTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     UpdateDisplay("800x600");
     aura::Window* default_container = Shell::GetContainer(
         Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
     layout_manager_ = GetWorkspaceLayoutManager(default_container);
+    keyboard::SetAccessibilityKeyboardEnabled(true);

[oshima, 2016/07/27 21:40:23]

Why this change here? Won't this change what other unittests test?

[hariank, 2016/07/27 23:00:39]

Done.

   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithBounds(bounds);
   }
 
   void ShowKeyboard() {
     layout_manager_->OnKeyboardBoundsChanging(keyboard_bounds_);
     restore_work_area_insets_ =
         display::Screen::GetScreen()->GetPrimaryDisplay().GetWorkAreaInsets();
@@ skipping 10 matching lines @@
 
   // Initializes the keyboard bounds using the bottom half of the work area.
   void InitKeyboardBounds() {
     gfx::Rect work_area(
         display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
     keyboard_bounds_.SetRect(work_area.x(),
                              work_area.y() + work_area.height() / 2,
                              work_area.width(), work_area.height() / 2);
   }
 
+  void SetVKFlag() {

[oshima, 2016/07/27 21:40:23]

EnableNewVKMode()

would be better.

[hariank, 2016/07/27 23:00:39]

Done.

+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    if (!command_line->HasSwitch(switches::kAshUseNewVKWindowBehavior)) {
+      command_line->AppendSwitch(switches::kAshUseNewVKWindowBehavior);
+    }
+  }
+
   const gfx::Rect& keyboard_bounds() const { return keyboard_bounds_; }
 
  private:
   gfx::Insets restore_work_area_insets_;
   gfx::Rect keyboard_bounds_;
   WorkspaceLayoutManager* layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerKeyboardTest);
 };
 
@@ skipping 87 matching lines @@
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithDelegate(&delegate2, -1, keyboard_bounds()));
   wm::GetWindowState(window.get())->set_ignore_keyboard_bounds_change(true);
   wm::ActivateWindow(window.get());
 
   EXPECT_EQ(keyboard_bounds(), window->bounds());
   ShowKeyboard();
   EXPECT_EQ(keyboard_bounds(), window->bounds());
 }
 
+TEST_F(WorkspaceLayoutManagerKeyboardTest, ChangeWorkAreaInNonStickyMode) {
+  InitKeyboardBounds();
+  Shell::GetInstance()->CreateKeyboard();
+  keyboard::KeyboardController* kb_controller =
+      keyboard::KeyboardController::GetInstance();
+
+  gfx::Rect work_area(
+      display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
+
+  aura::test::TestWindowDelegate delegate;
+  gfx::Rect orig_window_bounds(0, 100, work_area.width(),
+                               work_area.height() - 100);
+  gfx::Rect changed_window_bounds(0, 47, work_area.width(),
+                                  work_area.height() - 100);

[oshima, 2016/07/27 21:40:23]

can you compute this from keyboard bounds?

[hariank, 2016/07/27 23:00:38]

Done.

+  std::unique_ptr<aura::Window> window(
+      CreateTestWindowInShellWithDelegate(&delegate, -1, orig_window_bounds));
+
+  wm::ActivateWindow(window.get());
+  EXPECT_EQ(orig_window_bounds.ToString(), window->bounds().ToString());
+
+  // Open keyboard in non-sticky mode.
+  kb_controller->ShowKeyboard(false);
+  if (kb_controller->ui()->GetKeyboardWindow()->bounds().height() == 0) {

[oshima, 2016/07/27 21:40:23]

no conditional branch in unit test. Why do you need this?

[hariank, 2016/07/27 23:00:39]

Done.

+    kb_controller->ui()->GetKeyboardWindow()->SetBounds(
+        keyboard::FullWidthKeyboardBoundsFromRootBounds(
+            Shell::GetPrimaryRootWindow()->bounds(), 100));
+  }
+  // Window should be shifted up.
+  EXPECT_EQ(changed_window_bounds.ToString(), window->bounds().ToString());
+
+  kb_controller->HideKeyboard(
+      keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
+  EXPECT_EQ(orig_window_bounds.ToString(), window->bounds().ToString());
+
+  // Open keyboard in sticky mode.
+  kb_controller->ShowKeyboard(true);
+  if (kb_controller->ui()->GetKeyboardWindow()->bounds().height() == 0) {

[oshima, 2016/07/27 21:40:23]

same here.

[hariank, 2016/07/27 23:00:38]

Done.

+    kb_controller->ui()->GetKeyboardWindow()->SetBounds(
+        keyboard::FullWidthKeyboardBoundsFromRootBounds(
+            Shell::GetPrimaryRootWindow()->bounds(), 100));
+  }
+  // Window should be shifted up.
+  EXPECT_EQ(changed_window_bounds.ToString(), window->bounds().ToString());
+
+  kb_controller->HideKeyboard(
+      keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
+  EXPECT_EQ(orig_window_bounds.ToString(), window->bounds().ToString());
+}
+
+// When kAshUseNewVKWindowBehavior flag enabled, do not change accessibility
+// keyboard work area in non-sticky mode.
+TEST_F(WorkspaceLayoutManagerKeyboardTest,
+       IgnoreWorkAreaChangeinNonStickyMode) {
+  // Append flag to ignore work area change in non-sticky mode.
+  SetVKFlag();
+
+  InitKeyboardBounds();
+  Shell::GetInstance()->CreateKeyboard();
+  keyboard::KeyboardController* kb_controller =
+      keyboard::KeyboardController::GetInstance();
+
+  gfx::Rect work_area(
+      display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
+
+  aura::test::TestWindowDelegate delegate;
+  gfx::Rect orig_window_bounds(0, 100, work_area.width(),
+                               work_area.height() - 100);
+  gfx::Rect changed_window_bounds(0, 47, work_area.width(),
+                                  work_area.height() - 100);
+  std::unique_ptr<aura::Window> window(
+      CreateTestWindowInShellWithDelegate(&delegate, -1, orig_window_bounds));
+
+  wm::ActivateWindow(window.get());
+  EXPECT_EQ(orig_window_bounds.ToString(), window->bounds().ToString());
+
+  // Open keyboard in non-sticky mode.
+  kb_controller->ShowKeyboard(false);
+  if (kb_controller->ui()->GetKeyboardWindow()->bounds().height() == 0) {
+    kb_controller->ui()->GetKeyboardWindow()->SetBounds(
+        keyboard::FullWidthKeyboardBoundsFromRootBounds(
+            Shell::GetPrimaryRootWindow()->bounds(), 100));
+  }
+  // Window should not be shifted up.
+  EXPECT_EQ(orig_window_bounds.ToString(), window->bounds().ToString());
+
+  kb_controller->HideKeyboard(
+      keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
+  EXPECT_EQ(orig_window_bounds.ToString(), window->bounds().ToString());
+
+  // Open keyboard in sticky mode.
+  kb_controller->ShowKeyboard(true);
+  if (kb_controller->ui()->GetKeyboardWindow()->bounds().height() == 0) {
+    kb_controller->ui()->GetKeyboardWindow()->SetBounds(
+        keyboard::FullWidthKeyboardBoundsFromRootBounds(
+            Shell::GetPrimaryRootWindow()->bounds(), 100));
+  }
+  // Window should be shifted up.
+  EXPECT_EQ(changed_window_bounds.ToString(), window->bounds().ToString());
+
+  kb_controller->HideKeyboard(
+      keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
+  EXPECT_EQ(orig_window_bounds.ToString(), window->bounds().ToString());
+}
+
 }  // namespace ash