Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac775083 authored by Feng Cao's avatar Feng Cao Committed by android-build-merger
Browse files

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

am: 691fa971

Change-Id: Iaa7e6f11c57362266213850bbac861a9d7431c78
parents e43a07dc 691fa971

core/java/android/view/View.java

+6 −0
Original line number Diff line number Diff line
@@ -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.















     *

























core/java/android/widget/TextView.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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();