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

Commit 911cb1fa authored by Felipe Leme's avatar Felipe Leme
Browse files

DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit. 

This reverts commit ef1c0b36.

Test: atest CtsContentCaptureServiceTestCases
Test: m update-api

Bug: 130726495

Change-Id: Iecda9df96722ac8a3184710796032b6c01bd8ea3
parent 3e212a00

api/test-current.txt

+9 −0
Original line number Diff line number Diff line
@@ -3170,9 +3170,12 @@ package android.view { 
  }



  @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {

    method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForContentCapture();

    method public android.view.View getTooltipView();

    method public static boolean isDefaultFocusHighlightEnabled();

    method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);

    method public final boolean isImportantForContentCapture();

    method public void onProvideContentCaptureStructure(@NonNull android.view.ViewStructure, int);

    method protected void resetResolvedDrawables();

    method public void resetResolvedLayoutDirection();

    method public void resetResolvedPadding();
@@ -3183,7 +3186,13 @@ package android.view { 
    method public boolean restoreFocusNotInCluster();

    method public void setAutofilled(boolean);

    method public final void setFocusedInCluster();

    method public void setImportantForContentCapture(int);

    method public void setIsRootNamespace(boolean);

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_AUTO = 0; // 0x0

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO = 2; // 0x2

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS = 8; // 0x8

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES = 1; // 0x1

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS = 4; // 0x4

  }



  public class ViewConfiguration {

core/java/android/service/contentcapture/ContentCaptureService.java

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public abstract class ContentCaptureService extends Service { 
        @Override

        public void onDataRemovalRequest(DataRemovalRequest request) {

            mHandler.sendMessage(

                    obtainMessage(ContentCaptureService::handleOnUserDataRemovalRequest,

                    obtainMessage(ContentCaptureService::handleOnDataRemovalRequest,

                            ContentCaptureService.this, request));

        }
@@ -466,7 +466,7 @@ public abstract class ContentCaptureService extends Service { 
        onDestroyContentCaptureSession(new ContentCaptureSessionId(sessionId));

    }



    private void handleOnUserDataRemovalRequest(@NonNull DataRemovalRequest request) {

    private void handleOnDataRemovalRequest(@NonNull DataRemovalRequest request) {

        onDataRemovalRequest(request);

    }

core/java/android/view/View.java

+559 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/ViewGroup.java

+52 −8
Original line number Diff line number Diff line
@@ -3606,7 +3606,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            return;

        }



        final ChildListForAutofill children = getChildrenForAutofill(flags);

        final ChildListForAutoFillOrContentCapture children = getChildrenForAutofill(flags);

        final int childrenCount = children.size();

        structure.setChildCount(childrenCount);

        for (int i = 0; i < childrenCount; i++) {
@@ -3617,14 +3617,30 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        children.recycle();

    }



    /** @hide */

    @Override

    public void dispatchProvideContentCaptureStructure() {

        super.dispatchProvideContentCaptureStructure();



        if (!isLaidOut()) return;



        final ChildListForAutoFillOrContentCapture children = getChildrenForContentCapture();

        final int childrenCount = children.size();

        for (int i = 0; i < childrenCount; i++) {

            final View child = children.get(i);

            child.dispatchProvideContentCaptureStructure();

        }

        children.recycle();

    }



    /**

     * Gets the children for autofill. Children for autofill are the first

     * level descendants that are important for autofill. The returned

     * child list object is pooled and the caller must recycle it once done.

     * @hide */

    private @NonNull ChildListForAutofill getChildrenForAutofill(

    private @NonNull ChildListForAutoFillOrContentCapture getChildrenForAutofill(

            @AutofillFlags int flags) {

        final ChildListForAutofill children = ChildListForAutofill

        final ChildListForAutoFillOrContentCapture children = ChildListForAutoFillOrContentCapture

                .obtain();

        populateChildrenForAutofill(children, flags);

        return children;
@@ -3652,6 +3668,34 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        }

    }



    private @NonNull ChildListForAutoFillOrContentCapture getChildrenForContentCapture() {

        final ChildListForAutoFillOrContentCapture children = ChildListForAutoFillOrContentCapture

                .obtain();

        populateChildrenForContentCapture(children);

        return children;

    }



    /** @hide */

    private void populateChildrenForContentCapture(ArrayList<View> list) {

        final int childrenCount = mChildrenCount;

        if (childrenCount <= 0) {

            return;

        }

        final ArrayList<View> preorderedList = buildOrderedChildList();

        final boolean customOrder = preorderedList == null

                && isChildrenDrawingOrderEnabled();

        for (int i = 0; i < childrenCount; i++) {

            final int childIndex = getAndVerifyPreorderedIndex(childrenCount, i, customOrder);

            final View child = (preorderedList == null)

                    ? mChildren[childIndex] : preorderedList.get(childIndex);

            if (child.isImportantForContentCapture()) {

                list.add(child);

            } else if (child instanceof ViewGroup) {

                ((ViewGroup) child).populateChildrenForContentCapture(list);

            }

        }

    }



    private static View getAndVerifyPreorderedView(ArrayList<View> preorderedList, View[] children,

            int childIndex) {

        final View child;
@@ -8634,16 +8678,16 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    /**

     * Pooled class that to hold the children for autifill.

     */

    private static class ChildListForAutofill extends ArrayList<View> {

    private static class ChildListForAutoFillOrContentCapture extends ArrayList<View> {

        private static final int MAX_POOL_SIZE = 32;



        private static final Pools.SimplePool<ChildListForAutofill> sPool =

        private static final Pools.SimplePool<ChildListForAutoFillOrContentCapture> sPool =

                new Pools.SimplePool<>(MAX_POOL_SIZE);



        public static ChildListForAutofill obtain() {

            ChildListForAutofill list = sPool.acquire();

        public static ChildListForAutoFillOrContentCapture obtain() {

            ChildListForAutoFillOrContentCapture list = sPool.acquire();

            if (list == null) {

                list = new ChildListForAutofill();

                list = new ChildListForAutoFillOrContentCapture();

            }

            return list;

        }

core/java/android/view/ViewRootImpl.java

+157 −0
Original line number Diff line number Diff line
@@ -105,7 +105,11 @@ import android.view.accessibility.IAccessibilityInteractionConnection; 
import android.view.accessibility.IAccessibilityInteractionConnectionCallback;

import android.view.animation.AccelerateDecelerateInterpolator;

import android.view.animation.Interpolator;

import android.view.autofill.AutofillId;

import android.view.autofill.AutofillManager;

import android.view.contentcapture.ContentCaptureManager;

import android.view.contentcapture.ContentCaptureSession;

import android.view.contentcapture.MainContentCaptureSession;

import android.view.inputmethod.InputMethodManager;

import android.widget.Scroller;
@@ -220,6 +224,21 @@ public final class ViewRootImpl implements ViewParent, 
     */

    static final int MAX_TRACKBALL_DELAY = 250;



    /**

     * Initial value for {@link #mContentCaptureEnabled}.

     */

    private static final int CONTENT_CAPTURE_ENABLED_NOT_CHECKED = 0;



    /**

     * Value for {@link #mContentCaptureEnabled} when it was checked and set to {@code true}.

     */

    private static final int CONTENT_CAPTURE_ENABLED_TRUE = 1;



    /**

     * Value for {@link #mContentCaptureEnabled} when it was checked and set to {@code false}.

     */

    private static final int CONTENT_CAPTURE_ENABLED_FALSE = 2;



    @UnsupportedAppUsage

    static final ThreadLocal<HandlerActionQueue> sRunQueues = new ThreadLocal<HandlerActionQueue>();
@@ -410,6 +429,10 @@ public final class ViewRootImpl implements ViewParent, 
    boolean mLayoutRequested;

    boolean mFirst;



    @Nullable

    int mContentCaptureEnabled = CONTENT_CAPTURE_ENABLED_NOT_CHECKED;

    boolean mPerformContentCapture;



    boolean mReportNextDraw;

    boolean mFullRedrawNeeded;

    boolean mNewSurfaceNeeded;
@@ -607,6 +630,7 @@ public final class ViewRootImpl implements ViewParent, 
        mTransparentRegion = new Region();

        mPreviousTransparentRegion = new Region();

        mFirst = true; // true for the first time the view is added

        mPerformContentCapture = true; // also true for the first time the view is added

        mAdded = false;

        mAttachInfo = new View.AttachInfo(mWindowSession, mWindow, display, this, mHandler, this,

                context);
@@ -2756,9 +2780,55 @@ public final class ViewRootImpl implements ViewParent, 
            }

        }



        if (mAttachInfo.mContentCaptureEvents != null) {

            notifyContentCatpureEvents();

        }



        mIsInTraversal = false;

    }



    private void notifyContentCatpureEvents() {

        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "notifyContentCaptureEvents");

        try {

            MainContentCaptureSession mainSession = mAttachInfo.mContentCaptureManager

                    .getMainContentCaptureSession();

            for (int i = 0; i < mAttachInfo.mContentCaptureEvents.size(); i++) {

                int sessionId = mAttachInfo.mContentCaptureEvents.keyAt(i);

                mainSession.notifyViewTreeEvent(sessionId, /* started= */ true);

                ArrayList<Object> events = mAttachInfo.mContentCaptureEvents

                        .valueAt(i);

                for_each_event: for (int j = 0; j < events.size(); j++) {

                    Object event = events.get(j);

                    if (event instanceof AutofillId) {

                        mainSession.notifyViewDisappeared(sessionId, (AutofillId) event);

                    } else if (event instanceof View) {

                        View view = (View) event;

                        ContentCaptureSession session = view.getContentCaptureSession();

                        if (session == null) {

                            Log.w(mTag, "no content capture session on view: " + view);

                            continue for_each_event;

                        }

                        int actualId = session.getId();

                        if (actualId != sessionId) {

                            Log.w(mTag, "content capture session mismatch for view (" + view

                                    + "): was " + sessionId + " before, it's " + actualId + " now");

                            continue for_each_event;

                        }

                        ViewStructure structure = session.newViewStructure(view);

                        view.onProvideContentCaptureStructure(structure, /* flags= */ 0);

                        session.notifyViewAppeared(structure);

                    } else {

                        Log.w(mTag, "invalid content capture event: " + event);

                    }

                }

                mainSession.notifyViewTreeEvent(sessionId, /* started= */ false);

            }

            mAttachInfo.mContentCaptureEvents = null;

        } finally {

            Trace.traceEnd(Trace.TRACE_TAG_VIEW);

        }

    }



    private void notifySurfaceDestroyed() {

        mSurfaceHolder.ungetCallbacks();

        SurfaceHolder.Callback[] callbacks = mSurfaceHolder.getCallbacks();
@@ -2893,6 +2963,13 @@ public final class ViewRootImpl implements ViewParent, 
            }

        }

        mFirstInputStage.onWindowFocusChanged(hasWindowFocus);



        // NOTE: there's no view visibility (appeared / disapparead) events when the windows focus

        // is lost, so we don't need to to force a flush - there might be other events such as

        // text changes, but these should be flushed independently.

        if (hasWindowFocus) {

            handleContentCaptureFlush();

        }

    }



    private void fireAccessibilityFocusEventIfHasFocusedNode() {
@@ -3459,6 +3536,86 @@ public final class ViewRootImpl implements ViewParent, 
                pendingDrawFinished();

            }

        }

        if (mPerformContentCapture) {

            performContentCaptureInitialReport();

        }

    }



    /**

     * Checks (and caches) if content capture is enabled for this context.

     */

    private boolean isContentCaptureEnabled() {

        switch (mContentCaptureEnabled) {

            case CONTENT_CAPTURE_ENABLED_TRUE:

                return true;

            case CONTENT_CAPTURE_ENABLED_FALSE:

                return false;

            case CONTENT_CAPTURE_ENABLED_NOT_CHECKED:

                final boolean reallyEnabled = isContentCaptureReallyEnabled();

                mContentCaptureEnabled = reallyEnabled ? CONTENT_CAPTURE_ENABLED_TRUE

                        : CONTENT_CAPTURE_ENABLED_FALSE;

                return reallyEnabled;

            default:

                Log.w(TAG, "isContentCaptureEnabled(): invalid state " + mContentCaptureEnabled);

                return false;

        }



    }



    /**

     * Checks (without caching) if content capture is enabled for this context.

     */

    private boolean isContentCaptureReallyEnabled() {

        // First check if context supports it, so it saves a service lookup when it doesn't

        if (mContext.getContentCaptureOptions() == null) return false;



        final ContentCaptureManager ccm = mAttachInfo.getContentCaptureManager(mContext);

        // Then check if it's enabled in the contex itself.

        if (ccm == null || !ccm.isContentCaptureEnabled()) return false;



        return true;

    }



    private void performContentCaptureInitialReport() {

        mPerformContentCapture = false; // One-time offer!

        final View rootView = mView;

        if (DEBUG_CONTENT_CAPTURE) {

            Log.v(mTag, "performContentCaptureInitialReport() on " + rootView);

        }

        if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {

            Trace.traceBegin(Trace.TRACE_TAG_VIEW, "dispatchContentCapture() for "

                    + getClass().getSimpleName());

        }

        try {

            if (!isContentCaptureEnabled()) return;



            // Content capture is a go!

            rootView.dispatchInitialProvideContentCaptureStructure();

        } finally {

            Trace.traceEnd(Trace.TRACE_TAG_VIEW);

        }

    }



    private void handleContentCaptureFlush() {

        if (DEBUG_CONTENT_CAPTURE) {

            Log.v(mTag, "handleContentCaptureFlush()");

        }

        if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {

            Trace.traceBegin(Trace.TRACE_TAG_VIEW, "flushContentCapture for "

                    + getClass().getSimpleName());

        }

        try {

            if (!isContentCaptureEnabled()) return;



            final ContentCaptureManager ccm = mAttachInfo.mContentCaptureManager;

            if (ccm == null) {

                Log.w(TAG, "No ContentCapture on AttachInfo");

                return;

            }

            ccm.flush(ContentCaptureSession.FLUSH_REASON_VIEW_ROOT_ENTERED);

        } finally {

            Trace.traceEnd(Trace.TRACE_TAG_VIEW);

        }

    }



    private boolean draw(boolean fullRedrawNeeded) {