am b0440472
: mExpectingUpdateSelection was out of sync when nothing to delete.
* commit 'b04404722729f2fa988c46c4d9080415332bbeb5': mExpectingUpdateSelection was out of sync when nothing to delete.
This commit is contained in:
commit
b91d1d6645
1 changed files with 24 additions and 10 deletions
|
@ -1623,8 +1623,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
|||
case Constants.CODE_DELETE:
|
||||
mSpaceState = SPACE_STATE_NONE;
|
||||
handleBackspace(spaceState);
|
||||
mDeleteCount++;
|
||||
mExpectingUpdateSelection = true;
|
||||
LatinImeLogger.logOnDelete(x, y);
|
||||
break;
|
||||
case Constants.CODE_SHIFT:
|
||||
|
@ -2052,6 +2050,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
|||
}
|
||||
|
||||
private void handleBackspace(final int spaceState) {
|
||||
// We revert these in this method if the deletion doesn't happen.
|
||||
mDeleteCount++;
|
||||
mExpectingUpdateSelection = true;
|
||||
|
||||
// In many cases, we may have to put the keyboard in auto-shift state again. However
|
||||
// we want to wait a few milliseconds before doing it to avoid the keyboard flashing
|
||||
// during key repeat.
|
||||
|
@ -2141,8 +2143,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
|||
// This should never happen.
|
||||
Log.e(TAG, "Backspace when we don't know the selection position");
|
||||
}
|
||||
final int lengthToDelete = Character.isSupplementaryCodePoint(
|
||||
mConnection.getCodePointBeforeCursor()) ? 2 : 1;
|
||||
final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
|
||||
if (codePointBeforeCursor == Constants.NOT_A_CODE) {
|
||||
// Nothing to delete before the cursor. We have to revert the deletion states
|
||||
// that were updated at the beginning of this method.
|
||||
mDeleteCount--;
|
||||
mExpectingUpdateSelection = false;
|
||||
return;
|
||||
}
|
||||
final int lengthToDelete =
|
||||
Character.isSupplementaryCodePoint(codePointBeforeCursor) ? 2 : 1;
|
||||
if (mAppWorkAroundsUtils.isBeforeJellyBean() ||
|
||||
currentSettings.mInputAttributes.isTypeNull()) {
|
||||
// There are two possible reasons to send a key event: either the field has
|
||||
|
@ -2161,12 +2171,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
|||
true /* shouldUncommitLogUnit */);
|
||||
}
|
||||
if (mDeleteCount > DELETE_ACCELERATE_AT) {
|
||||
final int lengthToDeleteAgain = Character.isSupplementaryCodePoint(
|
||||
mConnection.getCodePointBeforeCursor()) ? 2 : 1;
|
||||
mConnection.deleteSurroundingText(lengthToDeleteAgain, 0);
|
||||
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
|
||||
ResearchLogger.latinIME_handleBackspace(lengthToDeleteAgain,
|
||||
true /* shouldUncommitLogUnit */);
|
||||
final int codePointBeforeCursorToDeleteAgain =
|
||||
mConnection.getCodePointBeforeCursor();
|
||||
if (codePointBeforeCursorToDeleteAgain != Constants.NOT_A_CODE) {
|
||||
final int lengthToDeleteAgain = Character.isSupplementaryCodePoint(
|
||||
codePointBeforeCursorToDeleteAgain) ? 2 : 1;
|
||||
mConnection.deleteSurroundingText(lengthToDeleteAgain, 0);
|
||||
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
|
||||
ResearchLogger.latinIME_handleBackspace(lengthToDeleteAgain,
|
||||
true /* shouldUncommitLogUnit */);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue