n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "handleBackspace should always send KEYCODE_DEL for InputType.TYPE_NULL" into jb-ub-latinimegoogle-bayo

Browse Source
This commit is contained in:
Ken Wakasa 2013-11-22 07:26:57 +00:00 committed by Android (Google) Code Review
commit e255d5c0f7
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2163,26 +2163,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// later (typically, in a subsequent press on backspace). // later (typically, in a subsequent press on backspace).
mLastSelectionEnd = mLastSelectionStart; mLastSelectionEnd = mLastSelectionStart;
mConnection.deleteSurroundingText(numCharsDeleted, 0); mConnection.deleteSurroundingText(numCharsDeleted, 0);
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_handleBackspace(numCharsDeleted,
false /* shouldUncommitLogUnit */);
}
} else { } else {
// There is no selection, just delete one character. // There is no selection, just delete one character.
if (NOT_A_CURSOR_POSITION == mLastSelectionEnd) { if (NOT_A_CURSOR_POSITION == mLastSelectionEnd) {
// This should never happen. // This should never happen.
Log.e(TAG, "Backspace when we don't know the selection position"); Log.e(TAG, "Backspace when we don't know the selection position");
} }
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() || if (mAppWorkAroundsUtils.isBeforeJellyBean() ||
currentSettings.mInputAttributes.isTypeNull()) { currentSettings.mInputAttributes.isTypeNull()) {
// There are two possible reasons to send a key event: either the field has // There are two possible reasons to send a key event: either the field has
@ -2193,23 +2179,28 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// applications are relying on this behavior so we continue to support it for // applications are relying on this behavior so we continue to support it for
// older apps, so we retain this behavior if the app has target SDK < JellyBean. // older apps, so we retain this behavior if the app has target SDK < JellyBean.
sendDownUpKeyEvent(KeyEvent.KEYCODE_DEL); sendDownUpKeyEvent(KeyEvent.KEYCODE_DEL);
if (mDeleteCount > DELETE_ACCELERATE_AT) {
sendDownUpKeyEvent(KeyEvent.KEYCODE_DEL);
}
} else { } else {
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;
mConnection.deleteSurroundingText(lengthToDelete, 0); mConnection.deleteSurroundingText(lengthToDelete, 0);
} if (mDeleteCount > DELETE_ACCELERATE_AT) {
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { final int codePointBeforeCursorToDeleteAgain =
ResearchLogger.latinIME_handleBackspace(lengthToDelete, mConnection.getCodePointBeforeCursor();
true /* shouldUncommitLogUnit */); if (codePointBeforeCursorToDeleteAgain != Constants.NOT_A_CODE) {
} final int lengthToDeleteAgain = Character.isSupplementaryCodePoint(
if (mDeleteCount > DELETE_ACCELERATE_AT) { codePointBeforeCursorToDeleteAgain) ? 2 : 1;
final int codePointBeforeCursorToDeleteAgain = mConnection.deleteSurroundingText(lengthToDeleteAgain, 0);
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 */);
} }
} }
} }