Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove verbose logcat messages in TextViewOnReceiveContentListener" into sc-dev am: 75dc1f16e3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687886

Change-Id: I91917cacbd370442dc3e5d039fa8470665166826
This commit is contained in:
Nikita Dubrovsky
2021-05-23 23:13:39 +00:00
committed by Automerger Merge Worker
parent 7a2dd1aefe 75dc1f16e3
commit 41c61e595a
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/widget/TextViewOnReceiveContentListener.java
View File

@@ -183,15 +183,9 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
*/
private static boolean isUsageOfImeCommitContentEnabled(@NonNull View view) {
if (view.getReceiveContentMimeTypes() != null) {
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "Fallback to commitContent disabled (custom callback is set)");
}
return false;
}
if (Compatibility.isChangeEnabled(AUTOFILL_NON_TEXT_REQUIRES_ON_RECEIVE_CONTENT_LISTENER)) {
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "Fallback to commitContent disabled (target SDK is above S)");
}
return false;
}
return true;
@@ -222,10 +216,6 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
*/
void setInputConnectionInfo(@NonNull TextView view, @NonNull InputConnection ic,
@NonNull EditorInfo editorInfo) {
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "setInputConnectionInfo: "
+ Arrays.toString(editorInfo.contentMimeTypes));
}
if (!isUsageOfImeCommitContentEnabled(view)) {
mInputConnectionInfo = null;
return;
@@ -243,9 +233,6 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
* callback instance.
*/
void clearInputConnectionInfo() {
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "clearInputConnectionInfo: " + mInputConnectionInfo);
}
mInputConnectionInfo = null;
}
@@ -265,17 +252,9 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
}
final InputConnectionInfo icInfo = mInputConnectionInfo;
if (icInfo == null) {
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "getEditorInfoMimeTypes: No usable EditorInfo");
}
return null;
}
final String[] editorInfoContentMimeTypes = icInfo.mEditorInfoContentMimeTypes;
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "getEditorInfoMimeTypes: "
+ Arrays.toString(editorInfoContentMimeTypes));
}
return editorInfoContentMimeTypes;
return icInfo.mEditorInfoContentMimeTypes;
}
/**