summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorJoanne Chung <joannechung@google.com>2021-07-02 00:14:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-02 00:14:45 +0000
commitee7d1075145f8ee422fa4cc6d15e6fcb26efd511 (patch)
tree4a6ef836d725ffac5d72ee0013617fe7febbd83e /core/java/android/widget/TextView.java
parent8da064040b29fde1a440b954ea2577f2236a6e7c (diff)
parent559b8dd0789a7de37a416beeacae0017ae5432fc (diff)
Merge "Disable log default dumps in debug ROM" into sc-dev am: 559b8dd078
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15048193 Change-Id: I406def52700d8b155e3e1d689ecadf753309dc3b
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 37374ef37ada..87301dcaa5dd 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -13901,7 +13901,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
public void onCreateViewTranslationRequest(@NonNull int[] supportedFormats,
@NonNull Consumer<ViewTranslationRequest> requestsCollector) {
if (supportedFormats == null || supportedFormats.length == 0) {
- // TODO(b/182433547): remove before S release
if (UiTranslationController.DEBUG) {
Log.w(LOG_TAG, "Do not provide the support translation formats.");
}
@@ -13912,7 +13911,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// Support Text translation
if (ArrayUtils.contains(supportedFormats, TranslationSpec.DATA_FORMAT_TEXT)) {
if (mText == null || mText.length() == 0) {
- // TODO(b/182433547): remove before S release
if (UiTranslationController.DEBUG) {
Log.w(LOG_TAG, "Cannot create translation request for the empty text.");
}
@@ -13926,7 +13924,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// it, it needs broader changes to text APIs, we only allow to translate non selectable
// and editable text in S.
if (isTextEditable() || isPassword || isTextSelectable()) {
- // TODO(b/182433547): remove before S release
if (UiTranslationController.DEBUG) {
Log.w(LOG_TAG, "Cannot create translation request. editable = "
+ isTextEditable() + ", isPassword = " + isPassword + ", selectable = "