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

Commit b3929115 authored by Reema Bajwa's avatar Reema Bajwa Committed by Android (Google) Code Review
Browse files

Merge "Use the right flag for credential view APIs" into main

parents aa2b17e5 1be13cc7

core/api/current.txt

+8 −8
Original line number Diff line number Diff line
@@ -52427,7 +52427,7 @@ package android.view { 
    method public final void cancelPendingInputEvents();

    method public boolean checkInputConnectionProxy(android.view.View);

    method public void clearAnimation();

    method @FlaggedApi("autofill_credman_dev_integration") public void clearCredentialManagerRequest();

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") public void clearCredentialManagerRequest();

    method public void clearFocus();

    method public void clearViewTranslationCallback();

    method public static int combineMeasuredStates(int, int);
@@ -52537,8 +52537,8 @@ package android.view { 
    method @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public final int getContentSensitivity();

    method @UiContext public final android.content.Context getContext();

    method protected android.view.ContextMenu.ContextMenuInfo getContextMenuInfo();

    method @FlaggedApi("autofill_credman_dev_integration") @Nullable public final android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException> getCredentialManagerCallback();

    method @FlaggedApi("autofill_credman_dev_integration") @Nullable public final android.credentials.GetCredentialRequest getCredentialManagerRequest();

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") @Nullable public final android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException> getCredentialManagerCallback();

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") @Nullable public final android.credentials.GetCredentialRequest getCredentialManagerRequest();

    method public final boolean getDefaultFocusHighlightEnabled();

    method public static int getDefaultSize(int, int);

    method public android.view.Display getDisplay();
@@ -52923,7 +52923,7 @@ package android.view { 
    method public void setContentDescription(CharSequence);

    method @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public final void setContentSensitivity(int);

    method public void setContextClickable(boolean);

    method @FlaggedApi("autofill_credman_dev_integration") public void setCredentialManagerRequest(@NonNull android.credentials.GetCredentialRequest, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") public void setCredentialManagerRequest(@NonNull android.credentials.GetCredentialRequest, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);

    method public void setDefaultFocusHighlightEnabled(boolean);

    method @Deprecated public void setDrawingCacheBackgroundColor(@ColorInt int);

    method @Deprecated public void setDrawingCacheEnabled(boolean);
@@ -53802,11 +53802,11 @@ package android.view { 
    method public abstract int addChildCount(int);

    method public abstract void asyncCommit();

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

    method @FlaggedApi("autofill_credman_dev_integration") public void clearCredentialManagerRequest();

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") public void clearCredentialManagerRequest();

    method @Nullable public abstract android.view.autofill.AutofillId getAutofillId();

    method public abstract int getChildCount();

    method @FlaggedApi("autofill_credman_dev_integration") @Nullable public android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException> getCredentialManagerCallback();

    method @FlaggedApi("autofill_credman_dev_integration") @Nullable public android.credentials.GetCredentialRequest getCredentialManagerRequest();

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") @Nullable public android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException> getCredentialManagerCallback();

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") @Nullable public android.credentials.GetCredentialRequest getCredentialManagerRequest();

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

    method public abstract CharSequence getHint();

    method public abstract CharSequence getText();
@@ -53831,7 +53831,7 @@ package android.view { 
    method public abstract void setClickable(boolean);

    method public abstract void setContentDescription(CharSequence);

    method public abstract void setContextClickable(boolean);

    method @FlaggedApi("autofill_credman_dev_integration") public void setCredentialManagerRequest(@NonNull android.credentials.GetCredentialRequest, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);

    method @FlaggedApi("android.service.autofill.autofill_credman_dev_integration") public void setCredentialManagerRequest(@NonNull android.credentials.GetCredentialRequest, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);

    method public abstract void setDataIsSensitive(boolean);

    method public abstract void setDimens(int, int, int, int, int, int);

    method public abstract void setElevation(float);

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

+4 −2
Original line number Diff line number Diff line 
package android.app.assist;



import static android.service.autofill.Flags.FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -1278,7 +1280,7 @@ public class AssistStructure implements Parcelable { 
         *

         * @hide

         */

        @FlaggedApi("autofill_credman_dev_integration")

        @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)

        @Nullable

        public GetCredentialRequest getCredentialManagerRequest() {

            return mGetCredentialRequest;
@@ -1291,7 +1293,7 @@ public class AssistStructure implements Parcelable { 
         * @hide

         *

         */

        @FlaggedApi("autofill_credman_dev_integration")

        @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)

        @Nullable

        public OutcomeReceiver<GetCredentialResponse,

                GetCredentialException> getCredentialManagerCallback() {

core/java/android/view/View.java

+5 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.view; 














import static android.content.res.Resources.ID_NULL;















import static android.os.Trace.TRACE_TAG_APP;













import static android.service.autofill.Flags.FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION;















import static android.view.ContentInfo.SOURCE_DRAG_AND_DROP;















import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;















import static android.view.Surface.FRAME_RATE_CATEGORY_LOW;










@@ -6995,7 +6996,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @see #setCredentialManagerRequest















     */













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    public void clearCredentialManagerRequest() {















        if (Log.isLoggable(AUTOFILL_LOG_TAG, Log.VERBOSE)) {















            Log.v(AUTOFILL_LOG_TAG, "clearCredentialManagerRequest called");










@@ -7027,7 +7028,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @param callback to be invoked when either a response or an exception needs to be















     *                 propagated for the given view















     */













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    public void setCredentialManagerRequest(@NonNull GetCredentialRequest request,















            @NonNull OutcomeReceiver<GetCredentialResponse, GetCredentialException> callback) {















        Preconditions.checkNotNull(request, "request must not be null");










@@ -9944,7 +9945,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @return The credential request associated with this View.















     */













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    @Nullable















    public final GetCredentialRequest getCredentialManagerRequest() {















        if (mViewCredentialHandler == null) {









@@ -9968,7 +9969,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @return The callback associated with this view that will be invoked on a response from















     * {@link CredentialManager} .















     */













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    @Nullable















    public final OutcomeReceiver<GetCredentialResponse,















            GetCredentialException> getCredentialManagerCallback() {

























core/java/android/view/ViewStructure.java



+6
−4




























Original line number
Diff line number
Diff line








@@ -16,6 +16,8 @@





























package android.view;





























import static android.service.autofill.Flags.FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION;





























import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;










@@ -361,7 +363,7 @@ public abstract class ViewStructure {













     * {@link ViewStructure#setCredentialManagerRequest(GetCredentialRequest, OutcomeReceiver)}















     */















    @Nullable













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    public GetCredentialRequest getCredentialManagerRequest() {















        return null;















    }









@@ -376,7 +378,7 @@ public abstract class ViewStructure {













     * {@link ViewStructure#setCredentialManagerRequest(GetCredentialRequest, OutcomeReceiver)}















     */















    @Nullable













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    public OutcomeReceiver<















            GetCredentialResponse, GetCredentialException> getCredentialManagerCallback() {















        return null;










@@ -551,7 +553,7 @@ public abstract class ViewStructure {













     * @param request the request to be fired















     * @param callback the callback where the response or exception, is returned















     */













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    public void setCredentialManagerRequest(@NonNull GetCredentialRequest request,















            @NonNull OutcomeReceiver<GetCredentialResponse, GetCredentialException> callback) {}

























@@ -559,7 +561,7 @@ public abstract class ViewStructure {













     * Clears the credential request previously set through















     * {@link ViewStructure#setCredentialManagerRequest(GetCredentialRequest, OutcomeReceiver)}















     */













    @FlaggedApi("autofill_credman_dev_integration")













    @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)















    public void clearCredentialManagerRequest() {}































    /**