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

Merge "Add the IntRange and IntDef annotations for initial text API" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-06 15:10:46 +00:00
committed by Android (Google) Code Review
parent 9496d1170a 071d81e623
commit 4d2caded83
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -51681,8 +51681,8 @@ package android.view.inputmethod {
method public void dump(android.util.Printer, String); method public void dump(android.util.Printer, String);
method @Nullable public CharSequence getInitialSelectedText(int); method @Nullable public CharSequence getInitialSelectedText(int);
method @Nullable public android.view.inputmethod.SurroundingText getInitialSurroundingText(@IntRange(from=0) int, @IntRange(from=0) int, int); method @Nullable public android.view.inputmethod.SurroundingText getInitialSurroundingText(@IntRange(from=0) int, @IntRange(from=0) int, int);
method @Nullable public CharSequence getInitialTextAfterCursor(int, int); method @Nullable public CharSequence getInitialTextAfterCursor(@IntRange(from=0) int, int);
method @Nullable public CharSequence getInitialTextBeforeCursor(int, int); method @Nullable public CharSequence getInitialTextBeforeCursor(@IntRange(from=0) int, int);
method public final void makeCompatible(int); method public final void makeCompatible(int);
method public void setInitialSurroundingSubText(@NonNull CharSequence, int); method public void setInitialSurroundingSubText(@NonNull CharSequence, int);
method public void setInitialSurroundingText(@NonNull CharSequence); method public void setInitialSurroundingText(@NonNull CharSequence);

8
core/java/android/view/inputmethod/EditorInfo.java
View File

@@ -725,7 +725,8 @@ public class EditorInfo implements InputType, Parcelable {
* protocol. * protocol.
*/ */
@Nullable @Nullable
public CharSequence getInitialTextBeforeCursor(int length, int flags) { public CharSequence getInitialTextBeforeCursor(
@IntRange(from = 0) int length, @InputConnection.GetTextType int flags) {
if (mInitialSurroundingText == null) { if (mInitialSurroundingText == null) {
return null; return null;
} }
@@ -750,7 +751,7 @@ public class EditorInfo implements InputType, Parcelable {
* this protocol is not supported. * this protocol is not supported.
*/ */
@Nullable @Nullable
public CharSequence getInitialSelectedText(int flags) { public CharSequence getInitialSelectedText(@InputConnection.GetTextType int flags) {
if (mInitialSurroundingText == null) { if (mInitialSurroundingText == null) {
return null; return null;
} }
@@ -792,7 +793,8 @@ public class EditorInfo implements InputType, Parcelable {
* protocol. * protocol.
*/ */
@Nullable @Nullable
public CharSequence getInitialTextAfterCursor(int length, int flags) { public CharSequence getInitialTextAfterCursor(
@IntRange(from = 0) int length, @InputConnection.GetTextType int flags) {
if (mInitialSurroundingText == null) { if (mInitialSurroundingText == null) {
return null; return null;
} }