aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-03-27 18:37:16 +0900
committerJean Chalard <jchalard@google.com>2014-04-03 15:36:15 +0900
commit8ab4ae4377fca97cb9ef05c615c5a59bc4bc3d8c (patch)
tree067576e06104df2b0e1371bee5251d1d92d5b612 /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
parent9320553ab922621f021a66f934ae9b40c8da21b8 (diff)
downloadlatinime-8ab4ae4377fca97cb9ef05c615c5a59bc4bc3d8c.tar.gz
latinime-8ab4ae4377fca97cb9ef05c615c5a59bc4bc3d8c.tar.xz
latinime-8ab4ae4377fca97cb9ef05c615c5a59bc4bc3d8c.zip
[IL133] Avoid calling a dangerous method from outside.
We want to remove all calls to this as it lets internal values escape, but there is some refactoring to do to finish this. Bug: 8636060 Change-Id: Iedba6afe4719bc0add868714a1ee5a04b7ead33e
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java')
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 536d6ef39..30357943c 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -537,7 +537,8 @@ public final class InputLogic {
// after typing some letters and a period, then gesturing; the keyboard is not in
// caps mode yet, but since a gesture is starting, it should go in caps mode,
// unless the user explictly said it should not.
- keyboardSwitcher.requestUpdatingShiftState();
+ keyboardSwitcher.requestUpdatingShiftState(getCurrentAutoCapsState(settingsValues),
+ getCurrentRecapitalizeState());
}
}
mConnection.endBatchEdit();
@@ -579,7 +580,8 @@ public final class InputLogic {
promotePhantomSpace(settingsValues);
mConnection.commitText(commitParts[0], 0);
mSpaceState = SpaceState.PHANTOM;
- keyboardSwitcher.requestUpdatingShiftState();
+ keyboardSwitcher.requestUpdatingShiftState(
+ getCurrentAutoCapsState(settingsValues), getCurrentRecapitalizeState());
mWordComposer.setCapitalizedModeAndPreviousWordAtStartComposingTime(
getActualCapsMode(settingsValues,
keyboardSwitcher.getKeyboardShiftMode()), commitParts[0]);
@@ -1821,7 +1823,8 @@ public final class InputLogic {
}
// Space state must be updated before calling updateShiftState
mSpaceState = SpaceState.PHANTOM;
- keyboardSwitcher.requestUpdatingShiftState();
+ keyboardSwitcher.requestUpdatingShiftState(getCurrentAutoCapsState(settingsValues),
+ getCurrentRecapitalizeState());
}
/**