Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only send text update for TextView after VIEW_ADDED is notified" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-08 17:58:59 +00:00
committed by Android (Google) Code Review
parent dcd4009817 9e4ca44e28
commit 691fa971ec
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/View.java
View File

@@ -9510,6 +9510,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mPrivateFlags4 &= ~PFLAG4_NOTIFIED_CONTENT_CAPTURE_DISAPPEARED;
}
/** @hide */
protected boolean getNotifiedContentCaptureAppeared() {
return (mPrivateFlags4 & PFLAG4_NOTIFIED_CONTENT_CAPTURE_APPEARED) != 0;
}
/**
* Sets the (optional) {@link ContentCaptureSession} associated with this view.
*

2
core/java/android/widget/TextView.java
View File

@@ -10586,7 +10586,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// notifyAppeared was not sent.
// ContentCapture
if (isLaidOut() && isImportantForContentCapture()) {
if (isLaidOut() && isImportantForContentCapture() && getNotifiedContentCaptureAppeared()) {
final ContentCaptureManager cm = mContext.getSystemService(ContentCaptureManager.class);
if (cm != null && cm.isContentCaptureEnabled()) {
final ContentCaptureSession session = getContentCaptureSession();