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

Commit dfdcef6d authored by Becca Hughes's avatar Becca Hughes
Browse files

Add framework change for manifest API change 

This CL contains the framework API change for adding
settings and updates capabilities. The logic is
in these CLs logic cl/21910331 cl/22121642 and here cl/21911122

RESOURCES_FINALIZATION=Cherry pick from master
Test: make
Bug: 267816301
Change-Id: I459c629b9f8494a8fefd20ea15daa6257af055c8
(cherry picked from commit on googleplex-android-review.googlesource.com host: 3f4bdc7c)
Merged-In: I459c629b9f8494a8fefd20ea15daa6257af055c8
parent 10be070b

core/api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ package android { 
    field public static final int canTakeScreenshot = 16844303; // 0x101060f

    field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230

    field public static final int cantSaveState = 16844142; // 0x101056e

    field public static final int capability;

    field @Deprecated public static final int capitalize = 16843113; // 0x1010169

    field public static final int category = 16843752; // 0x10103e8

    field public static final int centerBright = 16842956; // 0x10100cc
@@ -1447,6 +1448,7 @@ package android { 
    field public static final int sessionService = 16843837; // 0x101043d

    field public static final int settingsActivity = 16843301; // 0x1010225

    field public static final int settingsSliceUri = 16844179; // 0x1010593

    field public static final int settingsSubtitle;

    field public static final int setupActivity = 16843766; // 0x10103f6

    field public static final int shadowColor = 16843105; // 0x1010161

    field public static final int shadowDx = 16843106; // 0x1010162
@@ -40703,7 +40705,7 @@ package android.service.credentials { 
    method public abstract void onBeginGetCredential(@NonNull android.service.credentials.BeginGetCredentialRequest, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.service.credentials.BeginGetCredentialResponse,android.credentials.GetCredentialException>);

    method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);

    method public abstract void onClearCredentialState(@NonNull android.service.credentials.ClearCredentialStateRequest, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.credentials.ClearCredentialStateException>);

    field public static final String CAPABILITY_META_DATA_KEY = "android.credentials.capabilities";

    field @Deprecated public static final String CAPABILITY_META_DATA_KEY = "android.credentials.capabilities";

    field public static final String EXTRA_BEGIN_GET_CREDENTIAL_REQUEST = "android.service.credentials.extra.BEGIN_GET_CREDENTIAL_REQUEST";

    field public static final String EXTRA_BEGIN_GET_CREDENTIAL_RESPONSE = "android.service.credentials.extra.BEGIN_GET_CREDENTIAL_RESPONSE";

    field public static final String EXTRA_CREATE_CREDENTIAL_EXCEPTION = "android.service.credentials.extra.CREATE_CREDENTIAL_EXCEPTION";
@@ -40713,6 +40715,7 @@ package android.service.credentials { 
    field public static final String EXTRA_GET_CREDENTIAL_REQUEST = "android.service.credentials.extra.GET_CREDENTIAL_REQUEST";

    field public static final String EXTRA_GET_CREDENTIAL_RESPONSE = "android.service.credentials.extra.GET_CREDENTIAL_RESPONSE";

    field public static final String SERVICE_INTERFACE = "android.service.credentials.CredentialProviderService";

    field public static final String SERVICE_META_DATA = "android.credentials.provider";

  }















  public final class GetCredentialRequest implements android.os.Parcelable {

























core/java/android/service/credentials/CredentialProviderService.java



+36
−0




























Original line number
Diff line number
Diff line








@@ -156,8 +156,44 @@ public abstract class CredentialProviderService extends Service {





























    private static final String TAG = "CredProviderService";





























    /**













     * The list of capabilities exposed by a credential provider.













     *













     * @deprecated Replaced with {@link android.service.credentials#SERVICE_META_DATA}













     */













    @Deprecated















    public static final String CAPABILITY_META_DATA_KEY = "android.credentials.capabilities";





























     /**













      * Name under which a Credential Provider service component publishes information













      * about itself.  This meta-data must reference an XML resource containing













      * an













      * <code>&lt;{@link android.R.styleable#CredentialProvider credential-provider}&gt;</code>













      * tag.













      *













      * For example (AndroidManifest.xml):













      * <code>













      * <meta-data













      *         android:name="android.credentials.provider"













      *          android:resource="@xml/provider"/>













      * </code>













      *













      * For example (xml/provider.xml):













      * <code>













      * <credential-provider xmlns:android="http://schemas.android.com/apk/res/android"













      *       android:settingsSubtitle="@string/providerSubtitle">













      *      <capabilities>













      *          <capability>@string/passwords</capability>













      *          <capability>@string/passkeys</capability>













      *      </capabilities>













      *      <string name="passwords">android.credentials.TYPE_PASSWORD_CREDENTIAL</string>













      *      <string name="passkeys">android.credentials.TYPE_PUBLIC_KEY_CREDENTIAL</string>













      *  </credential-provider>













      * </code>













      */













    public static final String SERVICE_META_DATA = "android.credentials.provider";











































    /** @hide */















    public static final String TEST_SYSTEM_PROVIDER_META_DATA_KEY =















            "android.credentials.testsystemprovider";

































core/res/res/values/attrs.xml



+23
−0




























Original line number
Diff line number
Diff line








@@ -10083,4 +10083,27 @@













        <!-- Maximum width of height drawable. Drawables exceeding this size will be downsampled. -->















        <attr name="maxDrawableHeight" format="dimension"/>















    </declare-styleable>

























    <!-- =============================== -->













    <!-- Credential Manager attributes -->













    <!-- =============================== -->













    <eat-comment />

























    <!-- Contains Credential Provider related metadata. Since providers are exposed













         as services these should live under the service.













    -->













    <declare-styleable name="CredentialProvider">













        <!-- A string that is displayed to the user in the Credential Manager settings













             screen that can be used to provide more information about a provider. For













             longer strings (40 char) it will be truncated. If multiple services













             show the subtitle then the string will be joined together. -->













        <attr name="settingsSubtitle" format="string" />













    </declare-styleable>

























    <!-- A list of capabilities that indicates to the OS what kinds of credentials













             this provider supports. This list is defined in CredentialProviderService. -->













    <declare-styleable name="CredentialProvider_Capabilities" parent="CredentialProvider">













        <!-- An individual capability declared by the provider. -->













        <attr name="capability" format="string" />













    </declare-styleable>















    </resources>

























core/res/res/values/public-staging.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -130,6 +130,8 @@













    <public name="focusedSearchResultHighlightColor" />















    <public name="stylusHandwritingSettingsActivity" />















    <public name="windowNoMoveAnimation" />













    <public name="settingsSubtitle" />













    <public name="capability" />















  </staging-public-group>































  <staging-public-group type="id" first-id="0x01cd0000">