From b59dd13b9e83b299c00fbea40077d039c3ba82df Mon Sep 17 00:00:00 2001 From: Imanol Fernandez Date: Thu, 14 Mar 2019 22:39:40 +0100 Subject: [PATCH] Reset keyboard layout when active editable element changes focus (#1011) --- .../vrbrowser/ui/widgets/KeyboardWidget.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java index d6c5b9d20..13a5cd40f 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java @@ -201,16 +201,19 @@ public void setBrowserWidget(UIWidget aWidget) { } } + private void resetKeyboardLayout() { + ((CustomKeyboard)mKeyboardview.getKeyboard()).setImeOptions(mEditorInfo.imeOptions); + if ((mEditorInfo.inputType & EditorInfo.TYPE_CLASS_NUMBER) == EditorInfo.TYPE_CLASS_NUMBER) + mKeyboardview.setKeyboard(mKeyboardSymbols1); + else + mKeyboardview.setKeyboard(mKeyboardQuerty); + } + public void updateFocusedView(View aFocusedView) { mFocusedView = aFocusedView; if (aFocusedView != null && aFocusedView.onCheckIsTextEditor()) { mInputConnection = aFocusedView.onCreateInputConnection(mEditorInfo); - ((CustomKeyboard)mKeyboardview.getKeyboard()).setImeOptions(mEditorInfo.imeOptions); - if ((mEditorInfo.inputType & EditorInfo.TYPE_CLASS_NUMBER) == EditorInfo.TYPE_CLASS_NUMBER) - mKeyboardview.setKeyboard(mKeyboardSymbols1); - else - mKeyboardview.setKeyboard(mKeyboardQuerty); - + resetKeyboardLayout(); } else { mInputConnection = null; } @@ -544,7 +547,7 @@ private void postInputCommand(Runnable aRunnable) { @Override public void restartInput(@NonNull GeckoSession session, int reason) { - + resetKeyboardLayout(); } @Override