Rename getOnReceiveContentMimeTypes (drop "On") (f3ebaed6) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -7702,7 +7702,7 @@ package android.app.assist {
		method public int getMaxTextEms();
		method public int getMaxTextLength();
		method public int getMinTextEms();
		method @Nullable public String[] getOnReceiveContentMimeTypes();
		method @Nullable public String[] getReceiveContentMimeTypes();
		method public int getScrollX();
		method public int getScrollY();
		method @Nullable public CharSequence getText();
		@@ -48604,7 +48604,6 @@ package android.view {
		method @IdRes public int getNextFocusRightId();
		method @IdRes public int getNextFocusUpId();
		method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();
		method @Nullable public String[] getOnReceiveContentMimeTypes();
		method @ColorInt public int getOutlineAmbientShadowColor();
		method public android.view.ViewOutlineProvider getOutlineProvider();
		method @ColorInt public int getOutlineSpotShadowColor();
		@@ -48621,6 +48620,7 @@ package android.view {
		method public float getPivotX();
		method public float getPivotY();
		method public android.view.PointerIcon getPointerIcon();
		method @Nullable public String[] getReceiveContentMimeTypes();
		method public android.content.res.Resources getResources();
		method public final boolean getRevealOnFocusHint();
		method public final int getRight();
		@@ -49791,8 +49791,8 @@ package android.view {
		method public void setMaxTextEms(int);
		method public void setMaxTextLength(int);
		method public void setMinTextEms(int);
		method public void setOnReceiveContentMimeTypes(@Nullable String[]);
		method public abstract void setOpaque(boolean);
		method public void setReceiveContentMimeTypes(@Nullable String[]);
		method public abstract void setSelected(boolean);
		method public abstract void setText(CharSequence);
		method public abstract void setText(CharSequence, int, int);

core/java/android/app/assist/AssistStructure.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -717,7 +717,7 @@ public class AssistStructure implements Parcelable {
		String mWebDomain;
		Bundle mExtras;
		LocaleList mLocaleList;
		String[] mOnReceiveContentMimeTypes;
		String[] mReceiveContentMimeTypes;

		ViewNode[] mChildren;

		@@ -884,7 +884,7 @@ public class AssistStructure implements Parcelable {
		mLocaleList = in.readParcelable(null);
		}
		if ((flags & FLAGS_HAS_MIME_TYPES) != 0) {
		mOnReceiveContentMimeTypes = in.readStringArray();
		mReceiveContentMimeTypes = in.readStringArray();
		}
		if ((flags&FLAGS_HAS_EXTRAS) != 0) {
		mExtras = in.readBundle();
		@@ -945,7 +945,7 @@ public class AssistStructure implements Parcelable {
		if (mLocaleList != null) {
		flags \|= FLAGS_HAS_LOCALE_LIST;
		}
		if (mOnReceiveContentMimeTypes != null) {
		if (mReceiveContentMimeTypes != null) {
		flags \|= FLAGS_HAS_MIME_TYPES;
		}
		if (mExtras != null) {
		@@ -1119,7 +1119,7 @@ public class AssistStructure implements Parcelable {
		out.writeParcelable(mLocaleList, 0);
		}
		if ((flags & FLAGS_HAS_MIME_TYPES) != 0) {
		out.writeStringArray(mOnReceiveContentMimeTypes);
		out.writeStringArray(mReceiveContentMimeTypes);
		}
		if ((flags&FLAGS_HAS_EXTRAS) != 0) {
		out.writeBundle(mExtras);
		@@ -1540,12 +1540,12 @@ public class AssistStructure implements Parcelable {

		/**
		* Returns the MIME types accepted by {@link View#performReceiveContent} for this view. See
		* {@link View#getOnReceiveContentMimeTypes()} for details.
		* {@link View#getReceiveContentMimeTypes()} for details.
		*/
		@Nullable
		@SuppressLint("NullableCollection")
		public String[] getOnReceiveContentMimeTypes() {
		return mOnReceiveContentMimeTypes;
		public String[] getReceiveContentMimeTypes() {
		return mReceiveContentMimeTypes;
		}

		/**
		@@ -2168,8 +2168,8 @@ public class AssistStructure implements Parcelable {
		}

		@Override
		public void setOnReceiveContentMimeTypes(@Nullable String[] mimeTypes) {
		mNode.mOnReceiveContentMimeTypes = mimeTypes;
		public void setReceiveContentMimeTypes(@Nullable String[] mimeTypes) {
		mNode.mReceiveContentMimeTypes = mimeTypes;
		}

		@Override
		@@ -2449,7 +2449,7 @@ public class AssistStructure implements Parcelable {
		if (localeList != null) {
		Log.i(TAG, prefix + " LocaleList: " + localeList);
		}
		String[] mimeTypes = node.getOnReceiveContentMimeTypes();
		String[] mimeTypes = node.getReceiveContentMimeTypes();
		if (mimeTypes != null) {
		Log.i(TAG, prefix + " MIME types: " + Arrays.toString(mimeTypes));
		}

core/java/android/view/View.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -5253,7 +5253,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		int mUnbufferedInputSource = InputDevice.SOURCE_CLASS_NONE;

		@Nullable
		private String[] mOnReceiveContentMimeTypes;
		private String[] mReceiveContentMimeTypes;

		@Nullable
		private ViewTranslationCallback mViewTranslationCallback;
		@@ -8845,7 +8845,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		structure.setAutofillValue(getAutofillValue());
		}
		structure.setImportantForAutofill(getImportantForAutofill());
		structure.setOnReceiveContentMimeTypes(getOnReceiveContentMimeTypes());
		structure.setReceiveContentMimeTypes(getReceiveContentMimeTypes());
		}

		int ignoredParentLeft = 0;
		@@ -9064,7 +9064,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		Preconditions.checkArgument(Arrays.stream(mimeTypes).noneMatch(t -> t.startsWith("*")),
		"A MIME type set here must not start with *: " + Arrays.toString(mimeTypes));
		}
		mOnReceiveContentMimeTypes = ArrayUtils.isEmpty(mimeTypes) ? null : mimeTypes;
		mReceiveContentMimeTypes = ArrayUtils.isEmpty(mimeTypes) ? null : mimeTypes;
		getListenerInfo().mOnReceiveContentListener = listener;
		}

		@@ -9132,8 +9132,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		@SuppressLint("NullableCollection")
		@Nullable
		public String[] getOnReceiveContentMimeTypes() {
		return mOnReceiveContentMimeTypes;
		public String[] getReceiveContentMimeTypes() {
		return mReceiveContentMimeTypes;
		}

		/**

core/java/android/view/ViewStructure.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -373,12 +373,12 @@ public abstract class ViewStructure {
		public void setImportantForAutofill(@AutofillImportance int mode) {}

		/**
		* Sets the MIME types accepted by this view. See {@link View#getOnReceiveContentMimeTypes()}.
		* Sets the MIME types accepted by this view. See {@link View#getReceiveContentMimeTypes()}.
		*
		* <p>Should only be set when the node is used for Autofill or Content Capture purposes - it
		* will be ignored when used for Assist.
		*/
		public void setOnReceiveContentMimeTypes(
		public void setReceiveContentMimeTypes(
		@SuppressLint("NullableCollection") @Nullable String[] mimeTypes) {}

		/**

core/java/android/view/contentcapture/ViewNode.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public final class ViewNode extends AssistStructure.ViewNode {
		private String[] mAutofillHints;
		private AutofillValue mAutofillValue;
		private CharSequence[] mAutofillOptions;
		private String[] mOnReceiveContentMimeTypes;
		private String[] mReceiveContentMimeTypes;

		/** @hide */
		public ViewNode() {
		@@ -172,7 +172,7 @@ public final class ViewNode extends AssistStructure.ViewNode {
		mLocaleList = parcel.readParcelable(null);
		}
		if ((nodeFlags & FLAGS_HAS_MIME_TYPES) != 0) {
		mOnReceiveContentMimeTypes = parcel.readStringArray();
		mReceiveContentMimeTypes = parcel.readStringArray();
		}
		if ((nodeFlags & FLAGS_HAS_INPUT_TYPE) != 0) {
		mInputType = parcel.readInt();
		@@ -470,8 +470,8 @@ public final class ViewNode extends AssistStructure.ViewNode {

		@Override
		@Nullable
		public String[] getOnReceiveContentMimeTypes() {
		return mOnReceiveContentMimeTypes;
		public String[] getReceiveContentMimeTypes() {
		return mReceiveContentMimeTypes;
		}

		@Nullable
		@@ -519,7 +519,7 @@ public final class ViewNode extends AssistStructure.ViewNode {
		if (mLocaleList != null) {
		nodeFlags \|= FLAGS_HAS_LOCALE_LIST;
		}
		if (mOnReceiveContentMimeTypes != null) {
		if (mReceiveContentMimeTypes != null) {
		nodeFlags \|= FLAGS_HAS_MIME_TYPES;
		}
		if (mInputType != 0) {
		@@ -599,7 +599,7 @@ public final class ViewNode extends AssistStructure.ViewNode {
		parcel.writeParcelable(mLocaleList, 0);
		}
		if ((nodeFlags & FLAGS_HAS_MIME_TYPES) != 0) {
		parcel.writeStringArray(mOnReceiveContentMimeTypes);
		parcel.writeStringArray(mReceiveContentMimeTypes);
		}
		if ((nodeFlags & FLAGS_HAS_INPUT_TYPE) != 0) {
		parcel.writeInt(mInputType);
		@@ -929,8 +929,8 @@ public final class ViewNode extends AssistStructure.ViewNode {
		}

		@Override
		public void setOnReceiveContentMimeTypes(@Nullable String[] mimeTypes) {
		mNode.mOnReceiveContentMimeTypes = mimeTypes;
		public void setReceiveContentMimeTypes(@Nullable String[] mimeTypes) {
		mNode.mReceiveContentMimeTypes = mimeTypes;
		}

		@Override