Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the fallback logic in BaseInputConnection#getSurroundingText()

Browse Source 
Update the implementation of BaseInputConnection#getSurroundingText()
to fallback to use previous APIs for retrieving surrounding when there's
no valid editable. This will make the API when editor provides custom
InputConnection exends from BaseInputConnection (e.g. WebView & Google
Docs).

Also, update the fallback implementation to return null instead of empty
string when getTextBeforeCursor() or getTextAfterCursor() returns null,
to make IME is able to distinguish the two cases.

Test: atest CtsInputMethodTestCases:BaseInputConnectionTest
Test: verified manually

Bug: 167947745
Bug: 181303771
Bug: 182426649

Change-Id: I70527eb954a741640b728b4b7bb6c74e0e6496b7
This commit is contained in:
Lan Wei
2021-03-11 12:14:46 +08:00
parent 878589db08
commit 5f82653bee
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/inputmethod/BaseInputConnection.java
View File

@@ -608,7 +608,12 @@ public class BaseInputConnection implements InputConnection {
Preconditions.checkArgumentNonnegative(afterLength);
final Editable content = getEditable();
if (content == null) return null;
// If {@link #getEditable()} is null or {@code mEditable} is equal to {@link #getEditable()}
// (a.k.a, a fake editable), it means we cannot get valid content from the editable, so
// fallback to retrieve surrounding text from other APIs.
if (content == null || mEditable == content) {
return InputConnection.super.getSurroundingText(beforeLength, afterLength, flags);
}
int selStart = Selection.getSelectionStart(content);
int selEnd = Selection.getSelectionEnd(content);

10
core/java/android/view/inputmethod/InputConnection.java
View File

@@ -325,16 +325,16 @@ public interface InputConnection {
CharSequence textBeforeCursor = getTextBeforeCursor(beforeLength, flags);
if (textBeforeCursor == null) {
textBeforeCursor = "";
return null;
}
CharSequence textAfterCursor = getTextAfterCursor(afterLength, flags);
if (textAfterCursor == null) {
return null;
}
CharSequence selectedText = getSelectedText(flags);
if (selectedText == null) {
selectedText = "";
}
CharSequence textAfterCursor = getTextAfterCursor(afterLength, flags);
if (textAfterCursor == null) {
textAfterCursor = "";
}
CharSequence surroundingText =
TextUtils.concat(textBeforeCursor, selectedText, textAfterCursor);
return new SurroundingText(surroundingText, textBeforeCursor.length(),