diff options
| author | Nikita Dubrovsky <dubrovsky@google.com> | 2021-03-31 21:06:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-31 21:06:21 +0000 |
| commit | 2bb75a400731f49c2107b251655314126f9ae528 (patch) | |
| tree | c1147f712435dcd0f916aa701a62456093709b0b /core/java/android/widget/TextView.java | |
| parent | 68871a3d6bc1dfa39929f1f28721d55de388f1c4 (diff) | |
| parent | f3ebaed6e4d7d949acd5bc66d322a4f3d77f3a9b (diff) | |
Merge "Rename getOnReceiveContentMimeTypes (drop "On")" into sc-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index ffaa31552a6a..40c79cf086fc 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 |