commit 0fb7e834911192ed5b3b23e6e959a9acc2908c63
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 12 01:43:43 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 12 01:43:43 2018 +0000
tree d9d34e6fbba807e0e9e20bd1da472e937907ae88
parent 05b3b033be6ea09f27deab40d7aa635a23881bdf
parent 507bf13d086e7fa6a5977163b087c25c93f2587a

Merge "Don't generate VIEW_TEXT_CHANGED events when the TextView is not laid out."

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 2a42232..522be81 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10209,7 +10209,7 @@
         }
 
         // ContentCapture
-        if (isImportantForContentCapture() && isTextEditable()) {
+        if (isLaidOut() && isImportantForContentCapture() && isTextEditable()) {
             final ContentCaptureManager cm = mContext.getSystemService(ContentCaptureManager.class);
             if (cm != null && cm.isContentCaptureEnabled()) {
                 // TODO(b/111276913): pass flags when edited by user / add CTS test