Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d2caded authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9496d117 071d81e6

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -51681,8 +51681,8 @@ package android.view.inputmethod { 
    method public void dump(android.util.Printer, String);

    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 CharSequence getInitialTextAfterCursor(int, int);

    method @Nullable public CharSequence getInitialTextBeforeCursor(int, int);

    method @Nullable public CharSequence getInitialTextAfterCursor(@IntRange(from=0) int, int);

    method @Nullable public CharSequence getInitialTextBeforeCursor(@IntRange(from=0) int, int);

    method public final void makeCompatible(int);

    method public void setInitialSurroundingSubText(@NonNull CharSequence, int);

    method public void setInitialSurroundingText(@NonNull CharSequence);

core/java/android/view/inputmethod/EditorInfo.java

+5 −3
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ public class EditorInfo implements InputType, Parcelable { 
     * protocol.

     */

    @Nullable

    public CharSequence getInitialTextBeforeCursor(int length, int flags) {

    public CharSequence getInitialTextBeforeCursor(

            @IntRange(from = 0) int length, @InputConnection.GetTextType int flags) {

        if (mInitialSurroundingText == null) {

            return null;

        }
@@ -750,7 +751,7 @@ public class EditorInfo implements InputType, Parcelable { 
     * this protocol is not supported.

     */

    @Nullable

    public CharSequence getInitialSelectedText(int flags) {

    public CharSequence getInitialSelectedText(@InputConnection.GetTextType int flags) {

        if (mInitialSurroundingText == null) {

            return null;

        }
@@ -792,7 +793,8 @@ public class EditorInfo implements InputType, Parcelable { 
     * protocol.

     */

    @Nullable

    public CharSequence getInitialTextAfterCursor(int length, int flags) {

    public CharSequence getInitialTextAfterCursor(

            @IntRange(from = 0) int length, @InputConnection.GetTextType  int flags) {

        if (mInitialSurroundingText == null) {

            return null;

        }