AnySoftKeyboard: Added a variable to control for if autocap is on

1 files changed, 5 insertions, 1 deletions

diff --git a/ime/app/src/main/java/com/anysoftkeyboard/AnySoftKeyboard.java b/ime/app/src/main/java/com/anysoftkeyboard/AnySoftKeyboard.java
index b065d2104..e7e0b57b8 100644
--- a/ime/app/src/main/java/com/anysoftkeyboard/AnySoftKeyboard.java
+++ b/ime/app/src/main/java/com/anysoftkeyboard/AnySoftKeyboard.java
@@ -1348,10 +1348,14 @@ public abstract class AnySoftKeyboard extends AnySoftKeyboardColorizeNavBar {
     }
 
     private void updateShiftStateNow() {
+        boolean keyboardAutoCap;
+        AnyKeyboard alphabetKeyboard = getCurrentAlphabetKeyboard();
+        keyboardAutoCap = alphabetKeyboard.autoCap;
         final InputConnection ic = getCurrentInputConnection();
         EditorInfo ei = getCurrentInputEditorInfo();
         final int caps;
-        if (mAutoCap && ic != null && ei != null && ei.inputType != EditorInfo.TYPE_NULL) {
+        if (keyboardAutoCap && mAutoCap && ic != null && ei != null
+            && ei.inputType != EditorInfo.TYPE_NULL) {
             caps = ic.getCursorCapsMode(ei.inputType);
         } else {
             caps = 0;