nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 9de5cfc6: Fix a crash where revertSwap would be wrongly called 

* commit '9de5cfc67a4e349c547e40678add27cdd6ca8490':
  Fix a crash where revertSwap would be wrongly called
main
Jean Chalard 2012-01-11 19:54:43 -08:00 committed by Android Git Automerger
parent 062168b625 9de5cfc67a
commit a0c2c65f1f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1202,7 +1202,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// swap it, and override the space state with SPACESTATE_SWAP_PUNCTUATION. // swap it, and override the space state with SPACESTATE_SWAP_PUNCTUATION.
// To swap it, we fool handleSeparator to think the previous space state was a // To swap it, we fool handleSeparator to think the previous space state was a
// magic space. // magic space.
if (Keyboard.CODE_SPACE == toLeft && mSpaceState == SPACE_STATE_WEAK) { if (Keyboard.CODE_SPACE == toLeft && mSpaceState == SPACE_STATE_WEAK
&& mSettingsValues.isMagicSpaceSwapper(code))) {
mSpaceState = SPACE_STATE_MAGIC; mSpaceState = SPACE_STATE_MAGIC;
shouldRegisterSwapPunctuation = true; shouldRegisterSwapPunctuation = true;
} else { } else {
@ -2180,7 +2181,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// enter surrogate pairs this code will have been removed. // enter surrogate pairs this code will have been removed.
if (Keyboard.CODE_SPACE != textBeforeCursor.charAt(1)) { if (Keyboard.CODE_SPACE != textBeforeCursor.charAt(1)) {
// We should not have come here if the text before the cursor is not a space. // We should not have come here if the text before the cursor is not a space.
throw new RuntimeException("Tried to revert a swap of punctiation but we didn't " throw new RuntimeException("Tried to revert a swap of punctuation but we didn't "
+ "find a space just before the cursor."); + "find a space just before the cursor.");
} }
ic.beginBatchEdit(); ic.beginBatchEdit();