diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 19:57:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 20:01:42 +0100 |
| commit | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (patch) | |
| tree | 71e777ca1e33c58edd9149821e970495ef4b75b2 /src/android | |
| parent | e6234535929c67e7fbfa1ad7ce88f37df0b68d45 (diff) | |
| parent | 4d3781b640e8fb0a04e96b2d05199247556b8d86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
mkspecs/features/moc.prf
Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 3 |
1 files changed, 3 insertions, 0 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 bfdbaed43f..e0878f078f 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -276,6 +276,9 @@ public class QtActivityDelegate if (m_softInputMode != 0) { m_activity.getWindow().setSoftInputMode(m_softInputMode); + final boolean softInputIsHidden = (m_softInputMode & WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN) != 0; + if (softInputIsHidden) + return; } else { if (height > visibleHeight) m_activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); |