summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorNikita Dubrovsky <dubrovsky@google.com>2021-03-26 10:29:32 -0700
committerNikita Dubrovsky <dubrovsky@google.com>2021-03-26 10:48:58 -0700
commitf3ebaed6e4d7d949acd5bc66d322a4f3d77f3a9b (patch)
treeea56d78f75a31f9d9aa7a1d89d8e1f0dcc87b935 /core/java
parenteb2a57b8073e1af9f24f66e889a3007bfadb7e0f (diff)
Rename getOnReceiveContentMimeTypes (drop "On")
Bug: 179143943 Test: Presubmit Change-Id: Ib2109f0a45c25ae6c4507a9199bf8b34fc394af5
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/assist/AssistStructure.java20
-rw-r--r--core/java/android/view/View.java10
-rw-r--r--core/java/android/view/ViewStructure.java4
-rw-r--r--core/java/android/view/contentcapture/ViewNode.java16
-rw-r--r--core/java/android/view/inputmethod/BaseInputConnection.java4
-rw-r--r--core/java/android/widget/TextView.java8
-rw-r--r--core/java/android/widget/TextViewOnReceiveContentListener.java2
7 files changed, 32 insertions, 32 deletions
diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java
index 2b52875f4b0b..fc4a2b49d0c2 100644
--- a/core/java/android/app/assist/AssistStructure.java
+++ b/core/java/android/app/assist/AssistStructure.java
@@ -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));
}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a03e9e352c60..07531f2d8046 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -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;
}
/**
diff --git a/core/java/android/view/ViewStructure.java b/core/java/android/view/ViewStructure.java
index 8b3fb2e9e751..e2466345ff4a 100644
--- a/core/java/android/view/ViewStructure.java
+++ b/core/java/android/view/ViewStructure.java
@@ -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) {}
/**
diff --git a/core/java/android/view/contentcapture/ViewNode.java b/core/java/android/view/contentcapture/ViewNode.java
index 4e9c229e03a0..c882c6e3200d 100644
--- a/core/java/android/view/contentcapture/ViewNode.java
+++ b/core/java/android/view/contentcapture/ViewNode.java
@@ -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
diff --git a/core/java/android/view/inputmethod/BaseInputConnection.java b/core/java/android/view/inputmethod/BaseInputConnection.java
index c5bce28fcee1..eac28c64ae0e 100644
--- a/core/java/android/view/inputmethod/BaseInputConnection.java
+++ b/core/java/android/view/inputmethod/BaseInputConnection.java
@@ -938,12 +938,12 @@ public class BaseInputConnection implements InputConnection {
/**
* Default implementation which invokes {@link View#performReceiveContent} on the target
- * view if the view {@link View#getOnReceiveContentMimeTypes allows} content insertion;
+ * view if the view {@link View#getReceiveContentMimeTypes allows} content insertion;
* otherwise returns false without any side effects.
*/
public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
ClipDescription description = inputContentInfo.getDescription();
- if (mTargetView.getOnReceiveContentMimeTypes() == null) {
+ if (mTargetView.getReceiveContentMimeTypes() == null) {
if (DEBUG) {
Log.d(TAG, "Can't insert content from IME: content=" + description);
}
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 6733c0d3a8e1..c878717cd607 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8773,7 +8773,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
outAttrs.initialSelEnd = getSelectionEnd();
outAttrs.initialCapsMode = ic.getCursorCapsMode(getInputType());
outAttrs.setInitialSurroundingText(mText);
- outAttrs.contentMimeTypes = getOnReceiveContentMimeTypes();
+ outAttrs.contentMimeTypes = getReceiveContentMimeTypes();
return ic;
}
}
@@ -11741,10 +11741,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
}
}
- String[] mimeTypes = getOnReceiveContentMimeTypes();
+ String[] mimeTypes = getReceiveContentMimeTypes();
if (mimeTypes == null && mEditor != null) {
// If the app hasn't set a listener for receiving content on this view (ie,
- // getOnReceiveContentMimeTypes() returns null), check if it implements the
+ // getReceiveContentMimeTypes() returns null), check if it implements the
// keyboard image API and, if possible, use those MIME types as fallback.
// This fallback is only in place for autofill, not other mechanisms for
// inserting content. See AUTOFILL_NON_TEXT_REQUIRES_ON_RECEIVE_CONTENT_LISTENER
@@ -11752,7 +11752,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mimeTypes = mEditor.getDefaultOnReceiveContentListener()
.getFallbackMimeTypesForAutofill(this);
}
- structure.setOnReceiveContentMimeTypes(mimeTypes);
+ structure.setReceiveContentMimeTypes(mimeTypes);
}
if (!isPassword || viewFor == VIEW_STRUCTURE_FOR_AUTOFILL
diff --git a/core/java/android/widget/TextViewOnReceiveContentListener.java b/core/java/android/widget/TextViewOnReceiveContentListener.java
index 91fac5511807..0d5bf71dc955 100644
--- a/core/java/android/widget/TextViewOnReceiveContentListener.java
+++ b/core/java/android/widget/TextViewOnReceiveContentListener.java
@@ -194,7 +194,7 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
* non-text content.
*/
private static boolean isUsageOfImeCommitContentEnabled(@NonNull View view) {
- if (view.getOnReceiveContentMimeTypes() != null) {
+ if (view.getReceiveContentMimeTypes() != null) {
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "Fallback to commitContent disabled (custom callback is set)");
}