diff options
| author | rsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 20:22:58 +0000 |
|---|---|---|
| committer | rsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 20:22:58 +0000 |
| commit | 456413f70e210b23fc7ac13989425e0c93750d6d (patch) | |
| tree | 40d68c7bbc705bb227e1aa9cea42428910eae597 /ui | |
| parent | 1d88929e761889394c1a97e294e70932dafa5301 (diff) | |
| download | chromium_src-456413f70e210b23fc7ac13989425e0c93750d6d.zip chromium_src-456413f70e210b23fc7ac13989425e0c93750d6d.tar.gz chromium_src-456413f70e210b23fc7ac13989425e0c93750d6d.tar.bz2 | |
Keyboard height ratio for a11y keyboard.
BUG=338456
Review URL: https://codereview.chromium.org/131143005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/keyboard/keyboard_controller.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc index 764b552..668a8fd 100644 --- a/ui/keyboard/keyboard_controller.cc +++ b/ui/keyboard/keyboard_controller.cc @@ -36,9 +36,16 @@ const int kAnimationDurationMs = 200; // hide animation finishes. const float kAnimationStartOrAfterHideOpacity = 0.2f; +float GetKeyboardHeightRatio(){ + if (keyboard::IsKeyboardUsabilityExperimentEnabled()) { + return 1.0f; + } else if (keyboard::GetAccessibilityKeyboardEnabled()) { + return 0.4f; + } + return 0.3f; +} gfx::Rect KeyboardBoundsFromWindowBounds(const gfx::Rect& window_bounds) { - const float kKeyboardHeightRatio = - keyboard::IsKeyboardUsabilityExperimentEnabled() ? 1.0f : 0.3f; + const float kKeyboardHeightRatio = GetKeyboardHeightRatio(); return gfx::Rect( window_bounds.x(), window_bounds.y() + window_bounds.height() * (1 - kKeyboardHeightRatio), |