diff options
| author | Feng Cao <fengcao@google.com> | 2019-05-29 17:48:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-29 17:48:53 -0700 |
| commit | 23f11427f87d313695457c111c24f4ddddf74f7c (patch) | |
| tree | 208485730219d631a73c424de3dc0591faa2c3a7 /core/java/android/widget/TextView.java | |
| parent | d5e52d73504a4d858aa11a69ed6aca2275dde816 (diff) | |
| parent | 5f69e0c3615ea0ccb0fd4521a748601145436a4e (diff) | |
Merge "Make content capture send text update event for TextView even when it is not editable (EditText)" into qt-r1-dev am: f2f679afac
am: 5f69e0c361
Change-Id: Ia03b2a27b9e9beae3ddfed501770f209380b9b17
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 4da334b86010..956f6948c59c 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -10578,7 +10578,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // notifyAppeared was not sent. // ContentCapture - if (isLaidOut() && isImportantForContentCapture() && isTextEditable()) { + if (isLaidOut() && isImportantForContentCapture()) { final ContentCaptureManager cm = mContext.getSystemService(ContentCaptureManager.class); if (cm != null && cm.isContentCaptureEnabled()) { final ContentCaptureSession session = getContentCaptureSession(); |