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

Commit a515299d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add forAutoFill suffix on ViewStructure methods that add children."

parents 7fe805b1 dbe07a58

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -45942,7 +45942,7 @@ package android.view { 
    method public abstract int addChildCount(int);

    method public abstract void asyncCommit();

    method public abstract android.view.ViewStructure asyncNewChild(int);

    method public abstract android.view.ViewStructure asyncNewChild(int, int, int);

    method public abstract android.view.ViewStructure asyncNewChildForAutoFill(int, int, int);

    method public abstract int getChildCount();

    method public abstract android.os.Bundle getExtras();

    method public abstract java.lang.CharSequence getHint();
@@ -45951,7 +45951,7 @@ package android.view { 
    method public abstract int getTextSelectionStart();

    method public abstract boolean hasExtras();

    method public abstract android.view.ViewStructure newChild(int);

    method public abstract android.view.ViewStructure newChild(int, int, int);

    method public abstract android.view.ViewStructure newChildForAutoFill(int, int, int);

    method public abstract void setAccessibilityFocused(boolean);

    method public abstract void setActivated(boolean);

    method public abstract void setAlpha(float);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -49329,7 +49329,7 @@ package android.view { 
    method public abstract int addChildCount(int);

    method public abstract void asyncCommit();

    method public abstract android.view.ViewStructure asyncNewChild(int);

    method public abstract android.view.ViewStructure asyncNewChild(int, int, int);

    method public abstract android.view.ViewStructure asyncNewChildForAutoFill(int, int, int);

    method public abstract int getChildCount();

    method public abstract android.os.Bundle getExtras();

    method public abstract java.lang.CharSequence getHint();
@@ -49338,7 +49338,7 @@ package android.view { 
    method public abstract int getTextSelectionStart();

    method public abstract boolean hasExtras();

    method public abstract android.view.ViewStructure newChild(int);

    method public abstract android.view.ViewStructure newChild(int, int, int);

    method public abstract android.view.ViewStructure newChildForAutoFill(int, int, int);

    method public abstract void setAccessibilityFocused(boolean);

    method public abstract void setActivated(boolean);

    method public abstract void setAlpha(float);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -46305,7 +46305,7 @@ package android.view { 
    method public abstract int addChildCount(int);

    method public abstract void asyncCommit();

    method public abstract android.view.ViewStructure asyncNewChild(int);

    method public abstract android.view.ViewStructure asyncNewChild(int, int, int);

    method public abstract android.view.ViewStructure asyncNewChildForAutoFill(int, int, int);

    method public abstract int getChildCount();

    method public abstract android.os.Bundle getExtras();

    method public abstract java.lang.CharSequence getHint();
@@ -46314,7 +46314,7 @@ package android.view { 
    method public abstract int getTextSelectionStart();

    method public abstract boolean hasExtras();

    method public abstract android.view.ViewStructure newChild(int);

    method public abstract android.view.ViewStructure newChild(int, int, int);

    method public abstract android.view.ViewStructure newChildForAutoFill(int, int, int);

    method public abstract void setAccessibilityFocused(boolean);

    method public abstract void setActivated(boolean);

    method public abstract void setAlpha(float);

core/java/android/app/assist/AssistStructure.java

+2 −2
Original line number Diff line number Diff line
@@ -1517,7 +1517,7 @@ public class AssistStructure implements Parcelable { 


        // TODO(b/33197203, b/33802548): add CTS/unit test

        @Override

        public ViewStructure newChild(int index, int virtualId, int flags) {

        public ViewStructure newChildForAutoFill(int index, int virtualId, int flags) {

            return newChild(index, true, virtualId, flags);

        }
@@ -1527,7 +1527,7 @@ public class AssistStructure implements Parcelable { 
        }



        @Override

        public ViewStructure asyncNewChild(int index, int virtualId, int flags) {

        public ViewStructure asyncNewChildForAutoFill(int index, int virtualId, int flags) {

            return asyncNewChild(index, true, virtualId);

        }

core/java/android/view/ViewStructure.java

+26 −10
Original line number Diff line number Diff line
@@ -258,20 +258,25 @@ public abstract class ViewStructure { 
    /**

     * Create a new child {@link ViewStructure} in this view, putting into the list of

     * children at <var>index</var>.

     *

     * @return Returns an fresh {@link ViewStructure} ready to be filled in.

     */

    public abstract ViewStructure newChild(int index);



    /**

     * Like {@link #newChild(int)}, but providing a {@code virtualId} to the child so it can be

     * auto-filled by {@link View#autoFillVirtual(int, AutoFillValue)}.

     * Create a new child {@link ViewStructure} in this view for auto-fill purposes.

     *

     * @param index child index

     * @param virtualId id identifying the virtual child inside the custom view.

     * @param index the index (in the list of children) to put the new child at (see

     *            {@link #addChildCount(int)} and {@link #setChildCount(int)}.

     * @param virtualId an opaque ID to the Android System (although it could be meaningful to the

     *            {@link View} creating the {@link ViewStructure}), but it's the same id used on

     *            {@link View#autoFillVirtual(int, AutoFillValue)}.

     * @param flags currently {@code 0}.

     *

     * @return Returns an fresh {@link ViewStructure} ready to be filled in.

     */

    // TODO(b/33197203, b/33802548): add CTS/unit test

    public abstract ViewStructure newChild(int index, int virtualId, int flags);

    public abstract ViewStructure newChildForAutoFill(int index, int virtualId, int flags);



    /**

     * Like {@link #newChild}, but allows the caller to asynchronously populate the returned
@@ -284,15 +289,26 @@ public abstract class ViewStructure { 
    public abstract ViewStructure asyncNewChild(int index);



    /**

     * Like {@link #asyncNewChild(int)}, but providing a {@code virtualId} to the child so it can be

     * auto-filled by {@link View#autoFillVirtual(int, AutoFillValue)}.

     * Like {@link #newChildForAutoFill(int, int, int)}, but allows the caller to asynchronously

     * populate the returned child.

     *

     * <p>It can transfer the returned {@link ViewStructure} to another thread for it to build its

     * content (and children etc).

     *

     * @param index child index

     * @param virtualId id identifying the virtual child inside the custom view.

     * <p>Once done, some thread must call {@link #asyncCommit()} to tell the containing

     * {@link ViewStructure} that the async population is done.

     *

     * @param index the index (in the list of children) to put the new child at (see

     *            {@link #addChildCount(int)} and {@link #setChildCount(int)}.

     * @param virtualId an opaque ID to the Android System (although it could be meaningful to the

     *            {@link View} creating the {@link ViewStructure}), but it's the same id used on

     *            {@link View#autoFillVirtual(int, AutoFillValue)}.

     * @param flags currently {@code 0}.

     *

     * @return Returns an fresh {@link ViewStructure} ready to be filled in.

     */

    // TODO(b/33197203, b/33802548): add CTS/unit test

    public abstract ViewStructure asyncNewChild(int index, int virtualId, int flags);

    public abstract ViewStructure asyncNewChildForAutoFill(int index, int virtualId, int flags);



    /**

     * Sets the {@link AutoFillType} that can be used to auto-fill this node.