Commit 3293cbda authored by rsadam's avatar rsadam Committed by Commit bot

Fix animation distance.

BUG=355572

Review URL: https://codereview.chromium.org/544173006

Cr-Commit-Position: refs/heads/master@{#295075}
parent 57fa3c71
...@@ -370,7 +370,7 @@ void KeyboardController::HideKeyboard(HideReason reason) { ...@@ -370,7 +370,7 @@ void KeyboardController::HideKeyboard(HideReason reason) {
settings.SetTransitionDuration( settings.SetTransitionDuration(
base::TimeDelta::FromMilliseconds(kHideAnimationDurationMs)); base::TimeDelta::FromMilliseconds(kHideAnimationDurationMs));
gfx::Transform transform; gfx::Transform transform;
transform.Translate(0, proxy_->GetKeyboardWindow()->bounds().height()); transform.Translate(0, kAnimationDistance);
container_->SetTransform(transform); container_->SetTransform(transform);
container_->layer()->SetOpacity(kAnimationStartOrAfterHideOpacity); container_->layer()->SetOpacity(kAnimationStartOrAfterHideOpacity);
} }
...@@ -523,7 +523,7 @@ void KeyboardController::ShowKeyboardInternal() { ...@@ -523,7 +523,7 @@ void KeyboardController::ShowKeyboardInternal() {
// are at begin states for animation. // are at begin states for animation.
if (!container_animator->is_animating()) { if (!container_animator->is_animating()) {
gfx::Transform transform; gfx::Transform transform;
transform.Translate(0, proxy_->GetKeyboardWindow()->bounds().height()); transform.Translate(0, kAnimationDistance);
container_->SetTransform(transform); container_->SetTransform(transform);
container_->layer()->SetOpacity(kAnimationStartOrAfterHideOpacity); container_->layer()->SetOpacity(kAnimationStartOrAfterHideOpacity);
} }
......
...@@ -31,6 +31,9 @@ class WindowBoundsChangeObserver; ...@@ -31,6 +31,9 @@ class WindowBoundsChangeObserver;
class KeyboardControllerObserver; class KeyboardControllerObserver;
class KeyboardControllerProxy; class KeyboardControllerProxy;
// Animation distance.
const int kAnimationDistance = 30;
// Provides control of the virtual keyboard, including providing a container // Provides control of the virtual keyboard, including providing a container
// and controlling visibility. // and controlling visibility.
class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver, class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
......
...@@ -520,7 +520,7 @@ TEST_F(KeyboardControllerAnimationTest, ContainerAnimation) { ...@@ -520,7 +520,7 @@ TEST_F(KeyboardControllerAnimationTest, ContainerAnimation) {
EXPECT_TRUE(keyboard_window()->IsVisible()); EXPECT_TRUE(keyboard_window()->IsVisible());
float show_start_opacity = layer->opacity(); float show_start_opacity = layer->opacity();
gfx::Transform transform; gfx::Transform transform;
transform.Translate(0, keyboard_window()->bounds().height()); transform.Translate(0, kAnimationDistance);
EXPECT_EQ(transform, layer->transform()); EXPECT_EQ(transform, layer->transform());
EXPECT_EQ(gfx::Rect(), notified_bounds()); EXPECT_EQ(gfx::Rect(), notified_bounds());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment