Merge "Migrate android.view.inline to android.widget.inline" into rvc-dev am:... (51ec9d45) · Commits · e / os / android_frameworks_base

api/current.txt

+40 −39

Original line number	Diff line number	Diff line
		@@ -43134,9 +43134,9 @@ package android.service.autofill {
		}

		public final class InlinePresentation implements android.os.Parcelable {
		ctor public InlinePresentation(@NonNull android.app.slice.Slice, @NonNull android.view.inline.InlinePresentationSpec, boolean);
		ctor public InlinePresentation(@NonNull android.app.slice.Slice, @NonNull android.widget.inline.InlinePresentationSpec, boolean);
		method public int describeContents();
		method @NonNull public android.view.inline.InlinePresentationSpec getInlinePresentationSpec();
		method @NonNull public android.widget.inline.InlinePresentationSpec getInlinePresentationSpec();
		method @NonNull public android.app.slice.Slice getSlice();
		method public boolean isPinned();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -56779,38 +56779,6 @@ package android.view.contentcapture {

		}

		package android.view.inline {

		public class InlineContentView extends android.view.ViewGroup {
		method @Nullable public android.view.SurfaceControl getSurfaceControl();
		method public boolean isZOrderedOnTop();
		method public void onLayout(boolean, int, int, int, int);
		method public void setSurfaceControlCallback(@Nullable android.view.inline.InlineContentView.SurfaceControlCallback);
		method public boolean setZOrderedOnTop(boolean);
		}

		public static interface InlineContentView.SurfaceControlCallback {
		method public void onCreated(@NonNull android.view.SurfaceControl);
		method public void onDestroyed(@NonNull android.view.SurfaceControl);
		}

		public final class InlinePresentationSpec implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.util.Size getMaxSize();
		method @NonNull public android.util.Size getMinSize();
		method @Nullable public android.os.Bundle getStyle();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inline.InlinePresentationSpec> CREATOR;
		}

		public static final class InlinePresentationSpec.Builder {
		ctor public InlinePresentationSpec.Builder(@NonNull android.util.Size, @NonNull android.util.Size);
		method @NonNull public android.view.inline.InlinePresentationSpec build();
		method @NonNull public android.view.inline.InlinePresentationSpec.Builder setStyle(@NonNull android.os.Bundle);
		}

		}

		package android.view.inputmethod {

		public class BaseInputConnection implements android.view.inputmethod.InputConnection {
		@@ -56982,7 +56950,7 @@ package android.view.inputmethod {
		public final class InlineSuggestion implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.view.inputmethod.InlineSuggestionInfo getInfo();
		method public void inflate(@NonNull android.content.Context, @NonNull android.util.Size, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.inline.InlineContentView>);
		method public void inflate(@NonNull android.content.Context, @NonNull android.util.Size, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.widget.inline.InlineContentView>);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestion> CREATOR;
		}
		@@ -56990,7 +56958,7 @@ package android.view.inputmethod {
		public final class InlineSuggestionInfo implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String[] getAutofillHints();
		method @NonNull public android.view.inline.InlinePresentationSpec getPresentationSpec();
		method @NonNull public android.widget.inline.InlinePresentationSpec getInlinePresentationSpec();
		method @NonNull public String getSource();
		method @NonNull public String getType();
		method public boolean isPinned();
		@@ -57006,8 +56974,8 @@ package android.view.inputmethod {
		method public int describeContents();
		method @Nullable public android.os.Bundle getExtras();
		method @NonNull public String getHostPackageName();
		method @NonNull public java.util.List<android.widget.inline.InlinePresentationSpec> getInlinePresentationSpecs();
		method public int getMaxSuggestionCount();
		method @NonNull public java.util.List<android.view.inline.InlinePresentationSpec> getPresentationSpecs();
		method @NonNull public android.os.LocaleList getSupportedLocales();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestionsRequest> CREATOR;
		@@ -57015,10 +56983,11 @@ package android.view.inputmethod {
		}

		public static final class InlineSuggestionsRequest.Builder {
		ctor public InlineSuggestionsRequest.Builder(@NonNull java.util.List<android.view.inline.InlinePresentationSpec>);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder addPresentationSpecs(@NonNull android.view.inline.InlinePresentationSpec);
		ctor public InlineSuggestionsRequest.Builder(@NonNull java.util.List<android.widget.inline.InlinePresentationSpec>);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder addInlinePresentationSpecs(@NonNull android.widget.inline.InlinePresentationSpec);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest build();
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(@NonNull java.util.List<android.widget.inline.InlinePresentationSpec>);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setMaxSuggestionCount(int);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setSupportedLocales(@NonNull android.os.LocaleList);
		}
		@@ -61612,6 +61581,38 @@ package android.widget {

		}

		package android.widget.inline {

		public class InlineContentView extends android.view.ViewGroup {
		method @Nullable public android.view.SurfaceControl getSurfaceControl();
		method public boolean isZOrderedOnTop();
		method public void onLayout(boolean, int, int, int, int);
		method public void setSurfaceControlCallback(@Nullable android.widget.inline.InlineContentView.SurfaceControlCallback);
		method public boolean setZOrderedOnTop(boolean);
		}

		public static interface InlineContentView.SurfaceControlCallback {
		method public void onCreated(@NonNull android.view.SurfaceControl);
		method public void onDestroyed(@NonNull android.view.SurfaceControl);
		}

		public final class InlinePresentationSpec implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.util.Size getMaxSize();
		method @NonNull public android.util.Size getMinSize();
		method @Nullable public android.os.Bundle getStyle();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.widget.inline.InlinePresentationSpec> CREATOR;
		}

		public static final class InlinePresentationSpec.Builder {
		ctor public InlinePresentationSpec.Builder(@NonNull android.util.Size, @NonNull android.util.Size);
		method @NonNull public android.widget.inline.InlinePresentationSpec build();
		method @NonNull public android.widget.inline.InlinePresentationSpec.Builder setStyle(@NonNull android.os.Bundle);
		}

		}

		package dalvik.annotation {

		@Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface TestTarget {

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5052,7 +5052,7 @@ package android.view.inputmethod {
		}

		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[], @NonNull String, boolean);
		method @NonNull public static android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(@NonNull android.widget.inline.InlinePresentationSpec, @NonNull String, @Nullable String[], @NonNull String, boolean);
		}

		public final class InlineSuggestionsResponse implements android.os.Parcelable {

core/java/android/service/autofill/InlinePresentation.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.annotation.Size;
		import android.app.slice.Slice;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.view.inline.InlinePresentationSpec;
		import android.widget.inline.InlinePresentationSpec;

		import com.android.internal.util.DataClass;

		@@ -233,7 +233,7 @@ public final class InlinePresentation implements Parcelable {
		time = 1582753782651L,
		codegenVersion = "1.0.14",
		sourceFile = "frameworks/base/core/java/android/service/autofill/InlinePresentation.java",
		inputSignatures = "private final @android.annotation.NonNull android.app.slice.Slice mSlice\nprivate final @android.annotation.NonNull android.view.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final boolean mPinned\npublic @android.annotation.NonNull @android.annotation.Size(min=0L) java.lang.String[] getAutofillHints()\nclass InlinePresentation extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)")
		inputSignatures = "private final @android.annotation.NonNull android.app.slice.Slice mSlice\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final boolean mPinned\npublic @android.annotation.NonNull @android.annotation.Size(min=0L) java.lang.String[] getAutofillHints()\nclass InlinePresentation extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)")
		@Deprecated
		private void __metadata() {}

core/java/android/view/inline/InlineContentView.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,9 @@ import android.view.ViewGroup;
		* under the hosting window which could be useful in some cases, e.g. animating transitions.
		* At this point the inlined content will not be interactive and the touch events would
		* be delivered to your app.
		*
		* @hide
		* @removed
		*/
		public class InlineContentView extends ViewGroup {

core/java/android/view/inline/InlinePresentationSpec.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,4 +16,8 @@

		package android.view.inline;

		/**
		* @hide
		* @removed
		*/
		parcelable InlinePresentationSpec;