Reset shifted keyboard status when keyboard is changed (#1227)

MozillaReality · May 16, 2019 · baa8144 · baa8144
1 parent 0ccdaf8
commit baa8144
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -240,6 +240,7 @@ private void resetKeyboardLayout() {
         } else {
             mKeyboardView.setKeyboard(mCurrentKeyboard.getAlphabeticKeyboard());
         }
+        handleShift(false);
         updateCandidates();
     }
 
@@ -507,7 +508,6 @@ private void handleShift(boolean isShifted) {
                     if (mIsCapsLock) {
                         key.icon = mCapsLockOnIcon;
                         key.pressed = true;
-
                     } else {
                         key.icon = shifted ? mShiftOnIcon : mShiftOffIcon;
                         key.pressed = false;
@@ -588,6 +588,7 @@ private void handleLanguageChange(KeyboardInterface aKeyboard) {
 
         SettingsStore.getInstance(getContext()).setSelectedKeyboard(aKeyboard.getLocale());
         mKeyboardView.setKeyboard(mCurrentKeyboard.getAlphabeticKeyboard());
+        handleShift(false);
         hideOverlays();
         updateCandidates();
     }