diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-04-26 16:24:22 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-30 17:21:21 +0200 |
| commit | 8d1b8b97ac64060b91170d95213f27cc888d09e7 (patch) | |
| tree | 9b27cca851a61dcbee73c03658dc91302cb21cfd /src | |
| parent | c56372e379c8aae5e61badce1eaae2f7c3dfc2d5 (diff) | |
Don't block back button after keyboard is hidden
The back button would be non-responsive for 5 seconds after
hiding the software keyboard. This is a minimal change that
does not look into why we need to have a 5 second delay in
the first place.
Task-number: QTBUG-30752
Change-Id: Ied514b77650cea7accc37a03efef2ce861090f65
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index be618934df..06ece9d04c 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -704,10 +704,8 @@ public class QtActivityDelegate } } - if (keyCode == KeyEvent.KEYCODE_BACK && m_keyboardIsVisible) - { - if (!m_keyboardIsHiding) - hideSoftwareKeyboard(); + if (keyCode == KeyEvent.KEYCODE_BACK && m_keyboardIsVisible && !m_keyboardIsHiding) { + hideSoftwareKeyboard(); return true; } |