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

Commit 3e325a2b authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Make sure view.setAutofilled() is called when autofilled by... 

Merge "Make sure view.setAutofilled() is called when autofilled by augmented-autofill only." into qt-dev
am: 64f0871e

Change-Id: Ibf704b524efae59fc43efebe13442b7e9253d0e3
parents 5b486bc3 64f0871e

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3172,6 +3172,7 @@ package android.view { 


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

    method public android.view.View getTooltipView();

    method public boolean isAutofilled();

    method public static boolean isDefaultFocusHighlightEnabled();

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

    method protected void resetResolvedDrawables();

core/java/android/view/View.java

+1 −0
Original line number Diff line number Diff line
@@ -8852,6 +8852,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    /**

     * @hide

     */

    @TestApi

    public boolean isAutofilled() {

        return (mPrivateFlags3 & PFLAG3_IS_AUTOFILLED) != 0;

    }

core/java/android/view/autofill/AutofillManager.java

+7 −4
Original line number Diff line number Diff line
@@ -1204,10 +1204,6 @@ public final class AutofillManager { 
        AutofillValue value = null;



        synchronized (mLock) {

            if (mForAugmentedAutofillOnly) {

                if (sVerbose) Log.v(TAG,  "notifyValueChanged(): ignoring on augmented only mode");

                return;

            }

            // If the session is gone some fields might still be highlighted, hence we have to

            // remove the isAutofilled property even if no sessions are active.

            if (mLastAutofilledData == null) {
@@ -1229,6 +1225,13 @@ public final class AutofillManager { 
                }

            }



            if (mForAugmentedAutofillOnly) {

                if (sVerbose) {

                    Log.v(TAG,  "notifyValueChanged(): not notifying system server on "

                            + "augmented-only mode");

                }

                return;

            }

            if (!mEnabled || !isActiveLocked()) {

                if (sVerbose) {

                    Log.v(TAG, "notifyValueChanged(" + view.getAutofillId()