summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorJoanne Chung <joannechung@google.com>2021-06-24 05:14:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-24 05:14:05 +0000
commitc70e9d04d88c63087e67b8c490c834d20936444b (patch)
treeb310525e9f69d5b49aea0e01c3009ca826d52d79 /core/java/android/widget/TextView.java
parent6b5b3865bc27add575cb915808b32894184c2f89 (diff)
parentfa9dfa0d8077be9401a0f87e4f0f54d4edeb883a (diff)
Merge "Fix TextViewTranslationTest test fail." into sc-dev am: 27f397f55a am: fa9dfa0d80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15048192 Change-Id: I334bfc928978d5eebebfb7b5fbabf3c3a9a2059b
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 7f591c6163cb..dc6b0917f73d 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -13946,8 +13946,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
Log.w(LOG_TAG, "Cannot create translation request. editable = "
+ isTextEditable() + ", isPassword = " + isPassword + ", selectable = "
+ isTextSelectable());
- return;
}
+ return;
}
// TODO(b/176488462): apply the view's important for translation
requestBuilder.setValue(ViewTranslationRequest.ID_TEXT,