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

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

Merge "New Autofill API: SaveInfo.setTriggerId()"

parents b762f56e 2fe3ade8

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37251,6 +37251,7 @@ package android.service.autofill { 
    method public int describeContents();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.service.autofill.SaveInfo> CREATOR;

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

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

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

    field public static final int NEGATIVE_BUTTON_STYLE_REJECT = 1; // 0x1
@@ -37272,6 +37273,7 @@ package android.service.autofill { 
    method public android.service.autofill.SaveInfo.Builder setFlags(int);

    method public android.service.autofill.SaveInfo.Builder setNegativeAction(int, android.content.IntentSender);

    method public android.service.autofill.SaveInfo.Builder setOptionalIds(android.view.autofill.AutofillId[]);

    method public android.service.autofill.SaveInfo.Builder setTriggerId(android.view.autofill.AutofillId);

    method public android.service.autofill.SaveInfo.Builder setValidator(android.service.autofill.Validator);

  }

























api/system-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -40346,6 +40346,7 @@ package android.service.autofill {













    method public int describeContents();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.service.autofill.SaveInfo> CREATOR;













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















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















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















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









@@ -40367,6 +40368,7 @@ package android.service.autofill {













    method public android.service.autofill.SaveInfo.Builder setFlags(int);















    method public android.service.autofill.SaveInfo.Builder setNegativeAction(int, android.content.IntentSender);















    method public android.service.autofill.SaveInfo.Builder setOptionalIds(android.view.autofill.AutofillId[]);













    method public android.service.autofill.SaveInfo.Builder setTriggerId(android.view.autofill.AutofillId);















    method public android.service.autofill.SaveInfo.Builder setValidator(android.service.autofill.Validator);















  }







































api/test-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -37546,6 +37546,7 @@ package android.service.autofill {













    method public int describeContents();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.service.autofill.SaveInfo> CREATOR;













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















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















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















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









@@ -37567,6 +37568,7 @@ package android.service.autofill {













    method public android.service.autofill.SaveInfo.Builder setFlags(int);















    method public android.service.autofill.SaveInfo.Builder setNegativeAction(int, android.content.IntentSender);















    method public android.service.autofill.SaveInfo.Builder setOptionalIds(android.view.autofill.AutofillId[]);













    method public android.service.autofill.SaveInfo.Builder setTriggerId(android.view.autofill.AutofillId);















    method public android.service.autofill.SaveInfo.Builder setValidator(android.service.autofill.Validator);















  }







































core/java/android/app/Activity.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1879,7 +1879,7 @@ public class Activity extends ContextThemeWrapper





























        if (isFinishing()) {















            if (mAutoFillResetNeeded) {













                getAutofillManager().commit();













                getAutofillManager().onActivityFinished();















            } else if (mIntent != null















                    && mIntent.hasExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)) {















                // Activity was launched when user tapped a link in the Autofill Save UI - since

































core/java/android/service/autofill/AutofillService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -65,7 +65,7 @@ import com.android.internal.os.SomeArgs;













 *   <li>The service replies through {@link FillCallback#onSuccess(FillResponse)}.















 *   <li>The Android System calls {@link #onDisconnected()} and unbinds from the















 *       {@code AutofillService}.













 *   <li>The Android System displays an UI affordance with the options sent by the service.













 *   <li>The Android System displays an autofill UI with the options sent by the service.















 *   <li>The user picks an option.















 *   <li>The proper views are autofilled.















 * </ol>