summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorJoanne Chung <joannechung@google.com>2021-07-02 00:25:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-02 00:25:45 +0000
commitf6420f4d5655f1b6238cf72463455983271cbd3a (patch)
tree032e06b96e4ecf88b12f8c6fb3987be23f41d062 /core/java/android/widget/TextView.java
parentaa02ddf7e9a9bee0fc53a67b4f6fb13a43a67683 (diff)
parentee7d1075145f8ee422fa4cc6d15e6fcb26efd511 (diff)
Merge "Disable log default dumps in debug ROM" into sc-dev am: 559b8dd078 am: ee7d107514
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15048193 Change-Id: I114b2bfdb9f5c79eb5293ece33937812cf95df9c
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 dc6b0917f73d..d8031cc48a4d 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -13916,7 +13916,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.");
}
@@ -13927,7 +13926,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.");
}
@@ -13941,7 +13939,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 = "