Double space conversion should be enabled only when the 1st space is "weak".
bug: 5608934 Change-Id: Ide7ca9d526620c4f225a6f5eb27dcd7df5b504bd
This commit is contained in:
parent
6e3cb27cff
commit
ed631627cb
1 changed files with 8 additions and 1 deletions
|
@ -159,7 +159,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
|
|
||||||
// Magic space: a space that should disappear on space/apostrophe insertion, move after the
|
// Magic space: a space that should disappear on space/apostrophe insertion, move after the
|
||||||
// punctuation on punctuation insertion, and become a real space on alpha char insertion.
|
// punctuation on punctuation insertion, and become a real space on alpha char insertion.
|
||||||
// Weak space: a space that be swapped only by suggestion strip punctuation.
|
// Weak space: a space that should be swapped only by suggestion strip punctuation.
|
||||||
// Double space: the state where the user pressed space twice quickly, which LatinIME
|
// Double space: the state where the user pressed space twice quickly, which LatinIME
|
||||||
// resolved as period-space. Undoing this converts the period to a space.
|
// resolved as period-space. Undoing this converts the period to a space.
|
||||||
// Swap punctuation: the state where a (weak or magic) space and a punctuation from the
|
// Swap punctuation: the state where a (weak or magic) space and a punctuation from the
|
||||||
|
@ -762,6 +762,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
isSuggestionsStripVisible(), /* needsInputViewShown */ false);
|
isSuggestionsStripVisible(), /* needsInputViewShown */ false);
|
||||||
// Delay updating suggestions because keyboard input view may not be shown at this point.
|
// Delay updating suggestions because keyboard input view may not be shown at this point.
|
||||||
mHandler.postUpdateSuggestions();
|
mHandler.postUpdateSuggestions();
|
||||||
|
mHandler.cancelDoubleSpacesTimer();
|
||||||
|
|
||||||
inputView.setKeyPreviewPopupEnabled(mSettingsValues.mKeyPreviewPopupOn,
|
inputView.setKeyPreviewPopupEnabled(mSettingsValues.mKeyPreviewPopupOn,
|
||||||
mSettingsValues.mKeyPreviewPopupDismissDelay);
|
mSettingsValues.mKeyPreviewPopupDismissDelay);
|
||||||
|
@ -1288,6 +1289,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
// all inputs that do not result in a special state. Each character handling is then
|
// all inputs that do not result in a special state. Each character handling is then
|
||||||
// free to override the state as they see fit.
|
// free to override the state as they see fit.
|
||||||
final int spaceState = mSpaceState;
|
final int spaceState = mSpaceState;
|
||||||
|
|
||||||
|
// TODO: Consolidate the double space timer, mLastKeyTime, and the space state.
|
||||||
|
if (primaryCode != Keyboard.CODE_SPACE) {
|
||||||
|
mHandler.cancelDoubleSpacesTimer();
|
||||||
|
}
|
||||||
|
|
||||||
switch (primaryCode) {
|
switch (primaryCode) {
|
||||||
case Keyboard.CODE_DELETE:
|
case Keyboard.CODE_DELETE:
|
||||||
mSpaceState = SPACE_STATE_NONE;
|
mSpaceState = SPACE_STATE_NONE;
|
||||||
|
|
Loading…
Reference in a new issue