summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorJoanne Chung <joannechung@google.com>2021-06-24 04:58:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-24 04:58:57 +0000
commitfa9dfa0d8077be9401a0f87e4f0f54d4edeb883a (patch)
tree542aed299d869f66baf8fd07a235ca8861fe37dc /core/java/android/widget/TextView.java
parenta58335bc9319e39509a56ffb9ec1d30c1d778f95 (diff)
parent27f397f55a946aa4b17ce16170511c474dad9418 (diff)
Merge "Fix TextViewTranslationTest test fail." into sc-dev am: 27f397f55a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15048192 Change-Id: Id54d71daff4b8a29e10d18d3abd72cbe861d3429
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 83fd7b49c2bd..37374ef37ada 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -13931,8 +13931,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,