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

Commit 76a05b0f authored by Haoran Zhang's avatar Haoran Zhang Committed by Android (Google) Code Review
Browse files

Merge "[Credential Manager] Update UI APIs according to review feedback" into main

parents a8090f3e 7a94b853

core/api/system-current.txt

+3 −2
Original line number Diff line number Diff line
@@ -4414,8 +4414,9 @@ package android.credentials.selection { 
  }















  @FlaggedApi("android.credentials.flags.configurable_selector_ui_enabled") public final class CancelSelectionRequest implements android.os.Parcelable {













    ctor public CancelSelectionRequest(@NonNull android.credentials.selection.RequestToken, boolean, @NonNull String);















    method public int describeContents();













    method @NonNull public String getAppPackageName();













    method @NonNull public String getPackageName();















    method @NonNull public android.credentials.selection.RequestToken getRequestToken();















    method public boolean shouldShowCancellationExplanation();















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










@@ -4497,10 +4498,10 @@ package android.credentials.selection {



























  @FlaggedApi("android.credentials.flags.configurable_selector_ui_enabled") public final class RequestInfo implements android.os.Parcelable {















    method public int describeContents();













    method @NonNull public String getAppPackageName();















    method @Nullable public android.credentials.CreateCredentialRequest getCreateCredentialRequest();















    method @NonNull public java.util.List<java.lang.String> getDefaultProviderIds();















    method @Nullable public android.credentials.GetCredentialRequest getGetCredentialRequest();













    method @NonNull public String getPackageName();















    method @NonNull public java.util.List<java.lang.String> getRegistryProviderIds();















    method @NonNull public android.credentials.selection.RequestToken getRequestToken();















    method @NonNull public String getType();

























core/api/test-current.txt



+0
−4




























Original line number
Diff line number
Diff line








@@ -1283,10 +1283,6 @@ package android.credentials.selection {













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















  }





























  @FlaggedApi("android.credentials.flags.configurable_selector_ui_enabled") public final class CancelSelectionRequest implements android.os.Parcelable {













    ctor @FlaggedApi("android.credentials.flags.configurable_selector_ui_enabled") public CancelSelectionRequest(@NonNull android.os.IBinder, boolean, @NonNull String);













  }





























  @FlaggedApi("android.credentials.flags.configurable_selector_ui_enabled") public final class CreateCredentialProviderData extends android.credentials.selection.ProviderData implements android.os.Parcelable {















    ctor public CreateCredentialProviderData(@NonNull String, @NonNull java.util.List<android.credentials.selection.Entry>, @Nullable android.credentials.selection.Entry);















    method @Nullable public android.credentials.selection.Entry getRemoteEntry();

































core/java/android/credentials/selection/CancelSelectionRequest.java



+16
−14




























Original line number
Diff line number
Diff line








@@ -21,7 +21,6 @@ import static android.credentials.flags.Flags.FLAG_CONFIGURABLE_SELECTOR_UI_ENAB













import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.os.IBinder;















import android.os.Parcel;















import android.os.Parcelable;










@@ -59,7 +58,7 @@ public final class CancelSelectionRequest implements Parcelable {













    private final boolean mShouldShowCancellationExplanation;































    @NonNull













    private final String mAppPackageName;













    private final String mPackageName;































    /**















     * Returns the request token matching the user request that should be cancelled.









@@ -85,8 +84,8 @@ public final class CancelSelectionRequest implements Parcelable {













     * metadata (e.g. "Cancelled by `App Name`").















     */















    @NonNull













    public String getAppPackageName() {













        return mAppPackageName;













    public String getPackageName() {













        return mPackageName;















    }































    /**









@@ -98,33 +97,36 @@ public final class CancelSelectionRequest implements Parcelable {













        return mShouldShowCancellationExplanation;















    }













































    /**















     * Constructs a {@link CancelSelectionRequest}.















     *













     * @hide













     * @param requestToken request token matching the app request that should be cancelled













     * @param shouldShowCancellationExplanation whether the UI should display some informational













     *                                          cancellation message before closing













     * @param packageName package that is invoking this request













     *















     */













    @TestApi













    @FlaggedApi(FLAG_CONFIGURABLE_SELECTOR_UI_ENABLED)













    public CancelSelectionRequest(@NonNull IBinder token, boolean shouldShowCancellationExplanation,













            @NonNull String appPackageName) {













        mToken = token;













    public CancelSelectionRequest(@NonNull RequestToken requestToken,













            boolean shouldShowCancellationExplanation, @NonNull String packageName) {













        mToken = requestToken.getToken();















        mShouldShowCancellationExplanation = shouldShowCancellationExplanation;













        mAppPackageName = appPackageName;













        mPackageName = packageName;















    }































    private CancelSelectionRequest(@NonNull Parcel in) {















        mToken = in.readStrongBinder();















        AnnotationValidations.validate(NonNull.class, null, mToken);















        mShouldShowCancellationExplanation = in.readBoolean();













        mAppPackageName = in.readString8();













        AnnotationValidations.validate(NonNull.class, null, mAppPackageName);













        mPackageName = in.readString8();













        AnnotationValidations.validate(NonNull.class, null, mPackageName);















    }































    @Override















    public void writeToParcel(@NonNull Parcel dest, int flags) {















        dest.writeStrongBinder(mToken);















        dest.writeBoolean(mShouldShowCancellationExplanation);













        dest.writeString8(mAppPackageName);













        dest.writeString8(mPackageName);















    }































    @Override

































core/java/android/credentials/selection/IntentFactory.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -210,7 +210,8 @@ public class IntentFactory {













                                                .config_credentialManagerDialogComponent));















        intent.setComponent(componentName);















        intent.putExtra(CancelSelectionRequest.EXTRA_CANCEL_UI_REQUEST,













                new CancelSelectionRequest(requestToken, shouldShowCancellationUi, appPackageName));













                new CancelSelectionRequest(new RequestToken(requestToken), shouldShowCancellationUi,













                        appPackageName));















        return intent;















    }

















































core/java/android/credentials/selection/RequestInfo.java



+7
−7




























Original line number
Diff line number
Diff line








@@ -106,7 +106,7 @@ public final class RequestInfo implements Parcelable {













    private final String mType;































    @NonNull













    private final String mAppPackageName;













    private final String mPackageName;































    private final boolean mHasPermissionToOverrideDefault;


























@@ -172,8 +172,8 @@ public final class RequestInfo implements Parcelable {





























    /** Returns the display name of the app that made this request. */















    @NonNull













    public String getAppPackageName() {













        return mAppPackageName;













    public String getPackageName() {













        return mPackageName;















    }































    /**










@@ -248,7 +248,7 @@ public final class RequestInfo implements Parcelable {













            boolean isShowAllOptionsRequested) {















        mToken = token;















        mType = type;













        mAppPackageName = appPackageName;













        mPackageName = appPackageName;















        mCreateCredentialRequest = createCredentialRequest;















        mGetCredentialRequest = getCredentialRequest;















        mHasPermissionToOverrideDefault = hasPermissionToOverrideDefault;









@@ -270,8 +270,8 @@ public final class RequestInfo implements Parcelable {













        AnnotationValidations.validate(NonNull.class, null, mToken);















        mType = type;















        AnnotationValidations.validate(NonNull.class, null, mType);













        mAppPackageName = appPackageName;













        AnnotationValidations.validate(NonNull.class, null, mAppPackageName);













        mPackageName = appPackageName;













        AnnotationValidations.validate(NonNull.class, null, mPackageName);















        mCreateCredentialRequest = createCredentialRequest;















        mGetCredentialRequest = getCredentialRequest;















        mHasPermissionToOverrideDefault = in.readBoolean();









@@ -284,7 +284,7 @@ public final class RequestInfo implements Parcelable {













    public void writeToParcel(@NonNull Parcel dest, int flags) {















        dest.writeStrongBinder(mToken);















        dest.writeString8(mType);













        dest.writeString8(mAppPackageName);













        dest.writeString8(mPackageName);















        dest.writeTypedObject(mCreateCredentialRequest, flags);















        dest.writeTypedObject(mGetCredentialRequest, flags);















        dest.writeBoolean(mHasPermissionToOverrideDefault);