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

ash/wm/workspace/workspace_layout_manager_unittest.cc

Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index a1c239810319f12909e75811413aaf5f9f4409af..9b29baa9e339a718f1f7e3bf11805dc1941bff61 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -8,6 +8,7 @@
 #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"
@@ -27,6 +28,7 @@
 #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"
@@ -37,6 +39,9 @@
 #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"
@@ -1096,6 +1101,13 @@ class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase {
                              work_area.width(), work_area.height() / 2);
   }
 
+  void EnableNewVKMode() {
+    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:
@@ -1203,4 +1215,108 @@ TEST_F(WorkspaceLayoutManagerKeyboardTest, IgnoreKeyboardBoundsChagne) {
   EXPECT_EQ(keyboard_bounds(), window->bounds());
 }
 
+TEST_F(WorkspaceLayoutManagerKeyboardTest, ChangeWorkAreaInNonStickyMode) {
+  keyboard::SetAccessibilityKeyboardEnabled(true);
+  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);
+  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());

[oshima, 2016/07/28 15:53:47]

comparing with ToString() is old style. Can you just compare Rect?

[hariank, 2016/07/28 17:24:10]

Done.

+
+  // Open keyboard in non-sticky mode.
+  kb_controller->ShowKeyboard(false);
+  kb_controller->ui()->GetKeyboardWindow()->SetBounds(
+      keyboard::FullWidthKeyboardBoundsFromRootBounds(
+          Shell::GetPrimaryRootWindow()->bounds(), 100));

[oshima, 2016/07/28 15:53:47]

Did you copy this from
https://cs.chromium.org/chromium/src/ash/wm/lock_layout_manager_unittest.cc?r...

What it does is to use the bounds origin to see if it was set, so you can just
set it once here and remove next one.

[hariank, 2016/07/28 17:24:10]

Done.

+
+  int shift =
+      work_area.height() - kb_controller->GetContainerWindow()->bounds().y();
+  gfx::Rect changed_window_bounds(0, 100 - shift, work_area.width(),
+                                  work_area.height() - 100);

[oshima, 2016/07/28 15:53:47]

compure this from orig_window_bounds and Offset.

[hariank, 2016/07/28 17:24:10]

Done.

[oshima, 2016/07/28 17:33:48]

Sorry I wasn't clear. Here is what I meant

gfx::Rect changed_window_bounds(orig_window_bounds);
changedwindow_bounds.Offset(0, -shift);

[hariank, 2016/07/28 17:45:12]

Done.

+  // 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);
+  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.
+  EnableNewVKMode();
+
+  keyboard::SetAccessibilityKeyboardEnabled(true);
+  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);
+  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);
+  kb_controller->ui()->GetKeyboardWindow()->SetBounds(
+      keyboard::FullWidthKeyboardBoundsFromRootBounds(
+          Shell::GetPrimaryRootWindow()->bounds(), 100));
+
+  int shift =
+      work_area.height() - kb_controller->GetContainerWindow()->bounds().y();
+  gfx::Rect changed_window_bounds(0, 100 - shift, work_area.width(),
+                                  work_area.height() - 100);

[oshima, 2016/07/28 15:53:47]

same here, and move this to here it is used.

[hariank, 2016/07/28 17:24:10]

Done.

+  // 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);
+  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