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

Commit adb9ce4f authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Made the InlineSuggestion APIs testable."

parents 2cd68694 2e707603

api/test-current.txt

+12 −0
Original line number Diff line number Diff line
@@ -4672,6 +4672,18 @@ package android.view.contentcapture { 


package android.view.inputmethod {



  public final class InlineSuggestion implements android.os.Parcelable {

    method @NonNull public static android.view.inputmethod.InlineSuggestion newInlineSuggestion(@NonNull android.view.inputmethod.InlineSuggestionInfo);

  }



  public final class InlineSuggestionInfo implements android.os.Parcelable {

    method @NonNull public static android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(@NonNull android.view.inline.InlinePresentationSpec, @NonNull String, @Nullable String[]);

  }



  public final class InlineSuggestionsResponse implements android.os.Parcelable {

    method @NonNull public static android.view.inputmethod.InlineSuggestionsResponse newInlineSuggestionsResponse(@NonNull java.util.List<android.view.inputmethod.InlineSuggestion>);

  }



  public final class InputMethodManager {

    method public int getDisplayId();

    method public boolean isInputMethodPickerShown();

core/java/android/view/inputmethod/InlineSuggestion.java

+17 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view.inputmethod; 
import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.content.Context;

import android.os.AsyncTask;

import android.os.Parcelable;
@@ -60,6 +61,20 @@ public final class InlineSuggestion implements Parcelable { 


    private final @Nullable IInlineContentProvider mContentProvider;



    /**

     * Creates a new {@link InlineSuggestion}, for testing purpose.

     *

     * @hide

     */

    @TestApi

    @NonNull

    public static InlineSuggestion newInlineSuggestion(@NonNull InlineSuggestionInfo info) {

        return new InlineSuggestion(info, null);

    }









    /**

     * Inflates a view with the content of this suggestion at a specific size.

     * The size must be between the {@link InlinePresentationSpec#getMinSize() min size}
@@ -271,10 +286,10 @@ public final class InlineSuggestion implements Parcelable { 
    };



    @DataClass.Generated(

            time = 1575933636929L,

            time = 1578972138081L,

            codegenVersion = "1.0.14",

            sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestion.java",

            inputSignatures = "private static final  java.lang.String TAG\nprivate final @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo mInfo\nprivate final @android.annotation.Nullable com.android.internal.view.inline.IInlineContentProvider mContentProvider\npublic  void inflate(android.content.Context,android.util.Size,java.util.concurrent.Executor,java.util.function.Consumer<android.view.View>)\nclass InlineSuggestion extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")

            inputSignatures = "private static final  java.lang.String TAG\nprivate final @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo mInfo\nprivate final @android.annotation.Nullable com.android.internal.view.inline.IInlineContentProvider mContentProvider\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestion newInlineSuggestion(android.view.inputmethod.InlineSuggestionInfo)\npublic  void inflate(android.content.Context,android.util.Size,java.util.concurrent.Executor,java.util.function.Consumer<android.view.View>)\nclass InlineSuggestion extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")

    @Deprecated

    private void __metadata() {}

core/java/android/view/inputmethod/InlineSuggestionInfo.java

+16 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.view.inputmethod; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.os.Parcelable;

import android.view.inline.InlinePresentationSpec;
@@ -53,6 +54,19 @@ public final class InlineSuggestionInfo implements Parcelable { 
    /** Hints for the type of data being suggested. */

    private final @Nullable String[] mAutofillHints;



    /**

     * Creates a new {@link InlineSuggestionInfo}, for testing purpose.

     *

     * @hide

     */

    @TestApi

    @NonNull

    public static InlineSuggestionInfo newInlineSuggestionInfo(

            @NonNull InlinePresentationSpec presentationSpec,

            @NonNull @Source String source,

            @Nullable String[] autofillHints) {

        return new InlineSuggestionInfo(presentationSpec, source, autofillHints);

    }
@@ -247,10 +261,10 @@ public final class InlineSuggestionInfo implements Parcelable { 
    };



    @DataClass.Generated(

            time = 1574406074120L,

            time = 1578972121865L,

            codegenVersion = "1.0.14",

            sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionInfo.java",

            inputSignatures = "public static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_AUTOFILL\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_PLATFORM\nprivate final @android.annotation.NonNull android.view.inline.InlinePresentationSpec mPresentationSpec\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String mSource\nprivate final @android.annotation.Nullable java.lang.String[] mAutofillHints\nclass InlineSuggestionInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")

            inputSignatures = "public static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_AUTOFILL\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_PLATFORM\nprivate final @android.annotation.NonNull android.view.inline.InlinePresentationSpec mPresentationSpec\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String mSource\nprivate final @android.annotation.Nullable java.lang.String[] mAutofillHints\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(android.view.inline.InlinePresentationSpec,java.lang.String,java.lang.String[])\nclass InlineSuggestionInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")

    @Deprecated

    private void __metadata() {}

core/java/android/view/inputmethod/InlineSuggestionsResponse.java

+15 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.view.inputmethod; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.os.Parcelable;



import com.android.internal.util.DataClass;
@@ -33,6 +34,18 @@ import java.util.List; 
public final class InlineSuggestionsResponse implements Parcelable {

    private final @NonNull List<InlineSuggestion> mInlineSuggestions;



    /**

     * Creates a new {@link InlineSuggestionsResponse}, for testing purpose.

     *

     * @hide

     */

    @TestApi

    @NonNull

    public static InlineSuggestionsResponse newInlineSuggestionsResponse(

            @NonNull List<InlineSuggestion> inlineSuggestions) {

        return new InlineSuggestionsResponse(inlineSuggestions);

    }







    // Code below generated by codegen v1.0.14.
@@ -151,10 +164,10 @@ public final class InlineSuggestionsResponse implements Parcelable { 
    };



    @DataClass.Generated(

            time = 1574406147911L,

            time = 1578972149519L,

            codegenVersion = "1.0.14",

            sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionsResponse.java",

            inputSignatures = "private final @android.annotation.NonNull java.util.List<android.view.inputmethod.InlineSuggestion> mInlineSuggestions\nclass InlineSuggestionsResponse extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstructor=true)")

            inputSignatures = "private final @android.annotation.NonNull java.util.List<android.view.inputmethod.InlineSuggestion> mInlineSuggestions\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestionsResponse newInlineSuggestionsResponse(java.util.List<android.view.inputmethod.InlineSuggestion>)\nclass InlineSuggestionsResponse extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstructor=true)")

    @Deprecated

    private void __metadata() {}