diff options
author | 2014-01-27 09:29:50 +0000 | |
---|---|---|
committer | 2014-01-27 09:29:50 +0000 | |
commit | 68d7291a6bdc1d5633d744759a5c76599499d9e9 (patch) | |
tree | dd242826da5009a680d0ce3ffe08ce435db89877 /java/src/com/android/inputmethod/latin/LatinIME.java | |
parent | 46c37e63cc81a3a7e1bc72f82ad00925f334c8f9 (diff) | |
parent | 48df380f78215f1917c73cbdc9a124d4c9cd29d8 (diff) | |
download | latinime-68d7291a6bdc1d5633d744759a5c76599499d9e9.tar.gz latinime-68d7291a6bdc1d5633d744759a5c76599499d9e9.tar.xz latinime-68d7291a6bdc1d5633d744759a5c76599499d9e9.zip |
Merge "[IL77] Remove refs to Settings from InputLogic"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 5083c7798..82d824b8f 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1183,7 +1183,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen // the right layout. // TODO[IL]: Remove this, pass the input logic to the keyboard switcher instead? public int getCurrentAutoCapsState() { - return mInputLogic.getCurrentAutoCapsState(null /* optionalSettingsValues */); + return mInputLogic.getCurrentAutoCapsState(Settings.getInstance().getCurrent()); } // Called from the KeyboardSwitcher which needs to know recaps state to display @@ -1289,7 +1289,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mSubtypeSwitcher.switchToShortcutIME(this); // Still call the *#onCodeInput methods for readability. } - mInputLogic.onCodeInput(codeToSend, keyX, keyY, mHandler, mKeyboardSwitcher); + mInputLogic.onCodeInput(codeToSend, keyX, keyY, Settings.getInstance().getCurrent(), + mHandler, mKeyboardSwitcher); mKeyboardSwitcher.onCodeInput(codePoint); } |