Merge "Initial IME inline suggestions APIs" (cd79af4e) · Commits · e / os / android_frameworks_base

api/current.txt

+59 −0

Original line number	Diff line number	Diff line
		@@ -53452,6 +53452,23 @@ package android.view.contentcapture {

		}

		package android.view.inline {

		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 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();
		}

		}

		package android.view.inputmethod {

		public class BaseInputConnection implements android.view.inputmethod.InputConnection {
		@@ -53615,6 +53632,48 @@ package android.view.inputmethod {
		field public int token;
		}

		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.View>);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestion> CREATOR;
		}

		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 String getSource();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestionInfo> CREATOR;
		field public static final String SOURCE_AUTOFILL = "android:autofill";
		field public static final String SOURCE_PLATFORM = "android:platform";
		}

		public final class InlineSuggestionsRequest implements android.os.Parcelable {
		method public int describeContents();
		method public int getMaxSuggestionCount();
		method @NonNull public java.util.List<android.view.inline.InlinePresentationSpec> getPresentationSpecs();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestionsRequest> CREATOR;
		field public static final int SUGGESTION_COUNT_UNLIMITED = 2147483647; // 0x7fffffff
		}

		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);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest build();
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setMaxSuggestionCount(int);
		}

		public final class InlineSuggestionsResponse implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public java.util.List<android.view.inputmethod.InlineSuggestion> getInlineSuggestions();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InlineSuggestionsResponse> CREATOR;
		}

		public final class InputBinding implements android.os.Parcelable {
		ctor public InputBinding(android.view.inputmethod.InputConnection, android.os.IBinder, int, int);
		ctor public InputBinding(android.view.inputmethod.InputConnection, android.view.inputmethod.InputBinding);

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

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.view.inline;

		import android.annotation.NonNull;
		import android.content.Context;
		import android.graphics.PixelFormat;
		import android.view.SurfaceControl;
		import android.view.SurfaceHolder;
		import android.view.SurfaceView;

		/**
		* This class represents a view that can hold an opaque content that may be from a different source.
		*
		* @hide
		*/
		public class InlineContentView extends SurfaceView {
		public InlineContentView(@NonNull Context context,
		@NonNull SurfaceControl surfaceControl) {
		super(context);
		setZOrderOnTop(true);
		getHolder().addCallback(new SurfaceHolder.Callback() {
		@Override
		public void surfaceCreated(SurfaceHolder holder) {
		holder.setFormat(PixelFormat.TRANSPARENT);
		new SurfaceControl.Transaction()
		.reparent(surfaceControl, getSurfaceControl())
		.setVisibility(surfaceControl, /* visible */ true)
		.apply();
		}

		@Override
		public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
		// TODO(b/137800469): implement this.
		}

		@Override
		public void surfaceDestroyed(SurfaceHolder holder) {
		// TODO(b/137800469): implement this.
		}
		});
		}
		}

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

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.view.inline;

		parcelable InlinePresentationSpec;

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

0 → 100644

+244 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.view.inline;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.Parcelable;
		import android.util.Size;

		import com.android.internal.util.DataClass;

		/**
		* This class represents the presentation specification by which an inline suggestion
		* should abide when constructing its UI. Since suggestions are inlined in a
		* host application while provided by another source, they need to be consistent
		* with the host's look at feel to allow building smooth and integrated UIs.
		*/
		@DataClass(genEqualsHashCode = true, genToString = true, genBuilder = true)
		public final class InlinePresentationSpec implements Parcelable {
		/** The minimal size of the suggestion. */
		@NonNull
		private final Size mMinSize;
		/** The maximal size of the suggestion. */
		@NonNull
		private final Size mMaxSize;

		// TODO(b/137800469): add more attributes, such as text appearance info.

		/** @hide */
		@DataClass.Suppress({"setMaxSize", "setMinSize"})
		abstract static class BaseBuilder {
		}



		// Code below generated by codegen v1.0.14.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/view/inline/InlinePresentationSpec.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		@DataClass.Generated.Member
		/* package-private */ InlinePresentationSpec(
		@NonNull Size minSize,
		@NonNull Size maxSize) {
		this.mMinSize = minSize;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMinSize);
		this.mMaxSize = maxSize;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMaxSize);

		// onConstructed(); // You can define this method to get a callback
		}

		/**
		* The minimal size of the suggestion.
		*/
		@DataClass.Generated.Member
		public @NonNull Size getMinSize() {
		return mMinSize;
		}

		/**
		* The maximal size of the suggestion.
		*/
		@DataClass.Generated.Member
		public @NonNull Size getMaxSize() {
		return mMaxSize;
		}

		@Override
		@DataClass.Generated.Member
		public String toString() {
		// You can override field toString logic by defining methods like:
		// String fieldNameToString() { ... }

		return "InlinePresentationSpec { " +
		"minSize = " + mMinSize + ", " +
		"maxSize = " + mMaxSize +
		" }";
		}

		@Override
		@DataClass.Generated.Member
		public boolean equals(@Nullable Object o) {
		// You can override field equality logic by defining either of the methods like:
		// boolean fieldNameEquals(InlinePresentationSpec other) { ... }
		// boolean fieldNameEquals(FieldType otherValue) { ... }

		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		@SuppressWarnings("unchecked")
		InlinePresentationSpec that = (InlinePresentationSpec) o;
		//noinspection PointlessBooleanExpression
		return true
		&& java.util.Objects.equals(mMinSize, that.mMinSize)
		&& java.util.Objects.equals(mMaxSize, that.mMaxSize);
		}

		@Override
		@DataClass.Generated.Member
		public int hashCode() {
		// You can override field hashCode logic by defining methods like:
		// int fieldNameHashCode() { ... }

		int _hash = 1;
		_hash = 31 * _hash + java.util.Objects.hashCode(mMinSize);
		_hash = 31 * _hash + java.util.Objects.hashCode(mMaxSize);
		return _hash;
		}

		@Override
		@DataClass.Generated.Member
		public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {
		// You can override field parcelling by defining methods like:
		// void parcelFieldName(Parcel dest, int flags) { ... }

		dest.writeSize(mMinSize);
		dest.writeSize(mMaxSize);
		}

		@Override
		@DataClass.Generated.Member
		public int describeContents() { return 0; }

		/** @hide */
		@SuppressWarnings({"unchecked", "RedundantCast"})
		@DataClass.Generated.Member
		/* package-private */ InlinePresentationSpec(@NonNull android.os.Parcel in) {
		// You can override field unparcelling by defining methods like:
		// static FieldType unparcelFieldName(Parcel in) { ... }

		Size minSize = (Size) in.readSize();
		Size maxSize = (Size) in.readSize();

		this.mMinSize = minSize;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMinSize);
		this.mMaxSize = maxSize;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMaxSize);

		// onConstructed(); // You can define this method to get a callback
		}

		@DataClass.Generated.Member
		public static final @NonNull Parcelable.Creator<InlinePresentationSpec> CREATOR
		= new Parcelable.Creator<InlinePresentationSpec>() {
		@Override
		public InlinePresentationSpec[] newArray(int size) {
		return new InlinePresentationSpec[size];
		}

		@Override
		public InlinePresentationSpec createFromParcel(@NonNull android.os.Parcel in) {
		return new InlinePresentationSpec(in);
		}
		};

		/**
		* A builder for {@link InlinePresentationSpec}
		*/
		@SuppressWarnings("WeakerAccess")
		@DataClass.Generated.Member
		public static final class Builder extends BaseBuilder {

		private @NonNull Size mMinSize;
		private @NonNull Size mMaxSize;

		private long mBuilderFieldsSet = 0L;

		/**
		* Creates a new Builder.
		*
		* @param minSize
		* The minimal size of the suggestion.
		* @param maxSize
		* The maximal size of the suggestion.
		*/
		public Builder(
		@NonNull Size minSize,
		@NonNull Size maxSize) {
		mMinSize = minSize;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMinSize);
		mMaxSize = maxSize;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMaxSize);
		}

		/** Builds the instance. This builder should not be touched after calling this! */
		public @NonNull InlinePresentationSpec build() {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x4; // Mark builder used

		InlinePresentationSpec o = new InlinePresentationSpec(
		mMinSize,
		mMaxSize);
		return o;
		}

		private void checkNotUsed() {
		if ((mBuilderFieldsSet & 0x4) != 0) {
		throw new IllegalStateException(
		"This Builder should not be reused. Use a new Builder instance instead");
		}
		}
		}

		@DataClass.Generated(
		time = 1574406062532L,
		codegenVersion = "1.0.14",
		sourceFile = "frameworks/base/core/java/android/view/inline/InlinePresentationSpec.java",
		inputSignatures = "private final @android.annotation.NonNull android.util.Size mMinSize\nprivate final @android.annotation.NonNull android.util.Size mMaxSize\nclass InlinePresentationSpec extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nclass BaseBuilder extends java.lang.Object implements []")
		@Deprecated
		private void __metadata() {}


		//@formatter:on
		// End of generated code

		}

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

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.view.inputmethod;

		parcelable InlineSuggestion;