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

Commit 58510a2d authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev 

am: 5f797922

Change-Id: I64c55257b3652f1435f7beba1640fc0081ce4229
parents 157525ab 5f797922

api/current.txt

+4 −2
Original line number Diff line number Diff line
@@ -45353,6 +45353,7 @@ package android.view { 
    method public android.view.animation.Animation getAnimation();

    method public android.os.IBinder getApplicationWindowToken();

    method public java.lang.String[] getAutofillHints();

    method public final android.view.autofill.AutofillId getAutofillId();

    method public int getAutofillType();

    method public android.view.autofill.AutofillValue getAutofillValue();

    method public android.graphics.drawable.Drawable getBackground();
@@ -46475,6 +46476,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.autofill.AutofillId getAutofillId();

    method public abstract int getChildCount();

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

    method public abstract java.lang.CharSequence getHint();
@@ -46488,7 +46490,8 @@ package android.view { 
    method public abstract void setActivated(boolean);

    method public abstract void setAlpha(float);

    method public abstract void setAutofillHints(java.lang.String[]);

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

    method public abstract void setAutofillId(android.view.autofill.AutofillId);

    method public abstract void setAutofillId(android.view.autofill.AutofillId, int);

    method public abstract void setAutofillOptions(java.lang.CharSequence[]);

    method public abstract void setAutofillType(int);

    method public abstract void setAutofillValue(android.view.autofill.AutofillValue);
@@ -46518,7 +46521,6 @@ package android.view { 
    method public abstract void setTextLines(int[], int[]);

    method public abstract void setTextStyle(float, int, int, int);

    method public abstract void setTransformation(android.graphics.Matrix);

    method public abstract deprecated void setUrl(java.lang.String);

    method public abstract void setVisibility(int);

    method public abstract void setWebDomain(java.lang.String);

  }

api/system-current.txt

+4 −2
Original line number Diff line number Diff line
@@ -48935,6 +48935,7 @@ package android.view { 
    method public android.view.animation.Animation getAnimation();

    method public android.os.IBinder getApplicationWindowToken();

    method public java.lang.String[] getAutofillHints();

    method public final android.view.autofill.AutofillId getAutofillId();

    method public int getAutofillType();

    method public android.view.autofill.AutofillValue getAutofillValue();

    method public android.graphics.drawable.Drawable getBackground();
@@ -50057,6 +50058,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.autofill.AutofillId getAutofillId();

    method public abstract int getChildCount();

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

    method public abstract java.lang.CharSequence getHint();
@@ -50070,7 +50072,8 @@ package android.view { 
    method public abstract void setActivated(boolean);

    method public abstract void setAlpha(float);

    method public abstract void setAutofillHints(java.lang.String[]);

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

    method public abstract void setAutofillId(android.view.autofill.AutofillId);

    method public abstract void setAutofillId(android.view.autofill.AutofillId, int);

    method public abstract void setAutofillOptions(java.lang.CharSequence[]);

    method public abstract void setAutofillType(int);

    method public abstract void setAutofillValue(android.view.autofill.AutofillValue);
@@ -50100,7 +50103,6 @@ package android.view { 
    method public abstract void setTextLines(int[], int[]);

    method public abstract void setTextStyle(float, int, int, int);

    method public abstract void setTransformation(android.graphics.Matrix);

    method public abstract deprecated void setUrl(java.lang.String);

    method public abstract void setVisibility(int);

    method public abstract void setWebDomain(java.lang.String);

  }

api/test-current.txt

+4 −2
Original line number Diff line number Diff line
@@ -45736,6 +45736,7 @@ package android.view { 
    method public android.view.animation.Animation getAnimation();

    method public android.os.IBinder getApplicationWindowToken();

    method public java.lang.String[] getAutofillHints();

    method public final android.view.autofill.AutofillId getAutofillId();

    method public int getAutofillType();

    method public android.view.autofill.AutofillValue getAutofillValue();

    method public android.graphics.drawable.Drawable getBackground();
@@ -46866,6 +46867,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.autofill.AutofillId getAutofillId();

    method public abstract int getChildCount();

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

    method public abstract java.lang.CharSequence getHint();
@@ -46879,7 +46881,8 @@ package android.view { 
    method public abstract void setActivated(boolean);

    method public abstract void setAlpha(float);

    method public abstract void setAutofillHints(java.lang.String[]);

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

    method public abstract void setAutofillId(android.view.autofill.AutofillId);

    method public abstract void setAutofillId(android.view.autofill.AutofillId, int);

    method public abstract void setAutofillOptions(java.lang.CharSequence[]);

    method public abstract void setAutofillType(int);

    method public abstract void setAutofillValue(android.view.autofill.AutofillValue);
@@ -46909,7 +46912,6 @@ package android.view { 
    method public abstract void setTextLines(int[], int[]);

    method public abstract void setTextStyle(float, int, int, int);

    method public abstract void setTransformation(android.graphics.Matrix);

    method public abstract deprecated void setUrl(java.lang.String);

    method public abstract void setVisibility(int);

    method public abstract void setWebDomain(java.lang.String);

  }

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

+8 −3
Original line number Diff line number Diff line
@@ -1644,7 +1644,7 @@ public class AssistStructure implements Parcelable { 


        @Override

        public void setAutofillId(@NonNull ViewStructure parent, int virtualId) {

            mNode.mAutofillId = new AutofillId(parent.getAutofillId(), virtualId);

            setAutofillId(parent.getAutofillId(), virtualId);

        }



        @Override
@@ -1685,8 +1685,13 @@ public class AssistStructure implements Parcelable { 
        }



        @Override

        public void setAutofillId(int viewId) {

            mNode.mAutofillId = new AutofillId(viewId);

        public void setAutofillId(@NonNull AutofillId id) {

            mNode.mAutofillId = id;

        }



        @Override

        public void setAutofillId(@NonNull AutofillId parentId, int virtualId) {

            mNode.mAutofillId = new AutofillId(parentId, virtualId);

        }



        @Override

core/java/android/view/View.java

+39 −23
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import android.view.accessibility.AccessibilityWindowInfo; 
import android.view.animation.Animation;

import android.view.animation.AnimationUtils;

import android.view.animation.Transformation;

import android.view.autofill.AutofillId;

import android.view.autofill.AutofillManager;

import android.view.autofill.AutofillValue;

import android.view.inputmethod.EditorInfo;
@@ -1068,10 +1069,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY = "creditCardExpirationDay";















    /**













     * Hintd for the autofill services that describes the content of the view.













     * Hints for the autofill services that describes the content of the view.















     */















    private @Nullable String[] mAutofillHints;



























    /**













     * Autofill id, lazily created on calls to {@link #getAutofillId()}.













     */













    private AutofillId mAutofillId;



























    /** @hide */















    @IntDef({















            AUTOFILL_TYPE_NONE,










@@ -7276,13 +7282,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * <p>This method already provides most of what's needed for autofill, but should be overridden















     * when:













     * <ol>













     * <ul>















     *   <li>The view contents does not include PII (Personally Identifiable Information), so it















     * can call {@link ViewStructure#setDataIsSensitive(boolean)} passing {@code false}.















     *   <li>It must set fields such {@link ViewStructure#setText(CharSequence)},















     * {@link ViewStructure#setAutofillOptions(CharSequence[])},













     * or {@link ViewStructure#setUrl(String)}.













     * </ol>













     * or {@link ViewStructure#setWebDomain(String)}.













     * </ul>















     *















     * @param structure Fill in with structured view data. The default implementation















     * fills in all data that can be inferred from the view itself.









@@ -7292,12 +7298,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        onProvideStructureForAssistOrAutofill(structure, true);















    }



























    private void setAutofillId(ViewStructure structure) {













        // The autofill id needs to be unique, but its value doesn't matter,













        // so it's better to reuse the accessibility id to save space.













        structure.setAutofillId(getAccessibilityViewId());













    }



























    private void onProvideStructureForAssistOrAutofill(ViewStructure structure,















            boolean forAutofill) {















        final int id = mID;









@@ -7317,7 +7317,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        }





























        if (forAutofill) {













            setAutofillId(structure);















            final @AutofillType int autofillType = getAutofillType();















            // Don't need to fill autofill info if view does not support it.















            // For example, only TextViews that are editable support autofill










@@ -7418,10 +7417,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @param flags optional flags (currently {@code 0}).















     */















    public void onProvideAutofillVirtualStructure(ViewStructure structure, int flags) {













        // TODO(b/36171235): need a way to let apps set the ViewStructure without forcing them













        // to call super() (in case they override both this method and dispatchProvide....













        // Perhaps the best solution would simply make setAutofillId(ViewStructure) public.













        setAutofillId(structure);















    }





























    /**










@@ -7469,6 +7464,20 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    public void autofill(@NonNull @SuppressWarnings("unused") SparseArray<AutofillValue> values) {















    }



























    /**













     * Gets the unique identifier of this view on the screen for Autofill purposes.













     *













     * @return The View's Autofill id.













     */













    public final AutofillId getAutofillId() {













        if (mAutofillId == null) {













            // The autofill id needs to be unique, but its value doesn't matter,













            // so it's better to reuse the accessibility id to save space.













            mAutofillId = new AutofillId(getAccessibilityViewId());













        }













        return mAutofillId;













    }



























    /**















     * Describes the autofill type that should be used on calls to















     * {@link #autofill(AutofillValue)} and {@link #autofill(SparseArray)}.










@@ -7705,16 +7714,23 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    /**















     * Dispatch creation of {@link ViewStructure} down the hierarchy.















     *













     * <p>The structure must be filled according to the request type, which is set in the













     * {@code flags} parameter - see the documentation on each flag for more details.













     * <p>The default implementation does the following:













     *













     * <ul>













     *   <li>Sets the {@link AutofillId} in the structure.













     *   <li>Calls {@link #onProvideAutofillStructure(ViewStructure, int)}.













     *   <li>Calls {@link #onProvideAutofillVirtualStructure(ViewStructure, int)}.













     * </ul>















     *













     * <p>The default implementation calls {@link #onProvideAutofillStructure(ViewStructure, int)}













     * and {@link #onProvideAutofillVirtualStructure(ViewStructure, int)}.













     * <p>When overridden, it must either call













     * {@code super.dispatchProvideAutofillStructure(structure, flags)} or explicitly













     * set the {@link AutofillId} in the structure (for example, by calling













     * {@code structure.setAutofillId(getAutofillId())}).















     *















     * @param structure Fill in with structured view data.















     * @param flags optional flags (currently {@code 0}).















     */













    public void dispatchProvideAutofillStructure(ViewStructure structure, int flags) {













    public void dispatchProvideAutofillStructure(@NonNull ViewStructure structure, int flags) {















        dispatchProvideStructureForAssistOrAutofill(structure, true);















    }























@@ -7723,7 +7739,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        boolean blocked = forAutofill ? isAutofillBlocked() : isAssistBlocked();















        if (!blocked) {















            if (forAutofill) {













                setAutofillId(structure);













                structure.setAutofillId(getAutofillId());















                // NOTE: flags are not currently supported, hence 0















                onProvideAutofillStructure(structure, 0);















                onProvideAutofillVirtualStructure(structure, 0);