diff options
| author | Feng Cao <fengcao@google.com> | 2019-05-29 17:40:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-29 17:40:50 -0700 |
| commit | 5f69e0c3615ea0ccb0fd4521a748601145436a4e (patch) | |
| tree | 5e6429f6f8e4edda083f22986cd07fa267b08926 /core/java/android/widget/TextView.java | |
| parent | 39a94ec8e487263765846acbcaaf0669f3a92f08 (diff) | |
| parent | f2f679afac727670bed021f14d7a2b0170aa6e39 (diff) | |
Merge "Make content capture send text update event for TextView even when it is not editable (EditText)" into qt-r1-dev
am: f2f679afac
Change-Id: Ic51dfb3955783a015a4ae56c00c9746761517228
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 cdbec293a96d..383d9b4e9c41 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(); |