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

Commit 2740d701 authored by Helen Qin's avatar Helen Qin
Browse files

Update the passkey icon to new design. 

Bug: 302357972
Test: local verification (see bug for screenshots)
Change-Id: Ica9c644596d236f5df1174faac796d0e2cf42ab1
parent e809cd2e

packages/CredentialManager/res/drawable/ic_passkey_24.xml

+10 −12
Original line number Diff line number Diff line
@@ -13,16 +13,14 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<vector

    android:alpha="0.8"

    android:height="24dp"

    android:viewportHeight="24"

    android:viewportWidth="24"

<!--LINT.IfChange-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools">

  <path android:fillColor="#4C463C" android:fillType="evenOdd" android:pathData="M22.18,14.09C22.18,15.364 21.408,16.459 20.306,16.931L21.247,17.872L20.219,18.9L21.247,19.928L19.068,22.107L18.099,21.138L18.099,17.017C16.878,16.604 16,15.45 16,14.09C16,12.383 17.383,11 19.09,11C20.796,11 22.18,12.383 22.18,14.09ZM20.692,14.091C20.692,14.976 19.975,15.693 19.09,15.693C18.205,15.693 17.488,14.976 17.488,14.091C17.488,13.206 18.205,12.488 19.09,12.488C19.975,12.488 20.692,13.206 20.692,14.091Z"/>

  <path android:fillColor="#4C463C" android:pathData="M14.978,8.476C14.978,10.865 13.041,12.802 10.652,12.802C8.263,12.802 6.326,10.865 6.326,8.476C6.326,6.087 8.263,4.15 10.652,4.15C13.041,4.15 14.978,6.087 14.978,8.476Z"/>

  <path android:fillColor="#4C463C" android:pathData="M2,19.263C2,16.39 7.762,14.937 10.652,14.937C11.782,14.937 13.353,15.16 14.845,15.602C15.177,16.491 15.804,17.236 16.607,17.717V21.454H2V19.263Z"/>

        android:height="24dp"

        android:viewportWidth="960"

        android:viewportHeight="960">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M120,800L120,688Q120,654 137.5,625.5Q155,597 184,582Q246,551 310,535.5Q374,520 440,520Q460,520 480,521.5Q500,523 520,526Q516,584 541,635.5Q566,687 614,720L614,800L120,800ZM760,920L700,860L700,674Q656,661 628,624.5Q600,588 600,540Q600,482 641,441Q682,400 740,400Q798,400 839,441Q880,482 880,540Q880,585 854.5,620Q829,655 790,670L840,720L780,780L840,840L760,920ZM440,480Q374,480 327,433Q280,386 280,320Q280,254 327,207Q374,160 440,160Q506,160 553,207Q600,254 600,320Q600,386 553,433Q506,480 440,480ZM740,560Q757,560 768.5,548.5Q780,537 780,520Q780,503 768.5,491.5Q757,480 740,480Q723,480 711.5,491.5Q700,503 700,520Q700,537 711.5,548.5Q723,560 740,560Z"/>

</vector>

<!--LINT.ThenChange(/packages/CredentialManager/shared/res/drawable/ic_passkey_24.xml)-->
 
 No newline at end of file

packages/CredentialManager/shared/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ android_library { 
    name: "CredentialManagerShared",

    manifest: "AndroidManifest.xml",

    srcs: ["src/**/*.kt"],

    resource_dirs: ["res"],

    static_libs: [

        "androidx.activity_activity-compose",

        "androidx.core_core-ktx",

packages/CredentialManager/shared/res/drawable/ic_passkey_24.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<!--LINT.IfChange-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="960"

        android:viewportHeight="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M120,800L120,688Q120,654 137.5,625.5Q155,597 184,582Q246,551 310,535.5Q374,520 440,520Q460,520 480,521.5Q500,523 520,526Q516,584 541,635.5Q566,687 614,720L614,800L120,800ZM760,920L700,860L700,674Q656,661 628,624.5Q600,588 600,540Q600,482 641,441Q682,400 740,400Q798,400 839,441Q880,482 880,540Q880,585 854.5,620Q829,655 790,670L840,720L780,780L840,840L760,920ZM440,480Q374,480 327,433Q280,386 280,320Q280,254 327,207Q374,160 440,160Q506,160 553,207Q600,254 600,320Q600,386 553,433Q506,480 440,480ZM740,560Q757,560 768.5,548.5Q780,537 780,520Q780,503 768.5,491.5Q757,480 740,480Q723,480 711.5,491.5Q700,503 700,520Q700,537 711.5,548.5Q723,560 740,560Z"/>

</vector>

<!--LINT.ThenChange(/packages/CredentialManager/res/drawable/ic_passkey_24.xml)-->
 
 No newline at end of file

packages/CredentialManager/shared/src/com/android/credentialmanager/ktx/CredentialKtx.kt

+4 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import androidx.credentials.provider.PasswordCredentialEntry 
import androidx.credentials.provider.PublicKeyCredentialEntry

import androidx.credentials.provider.RemoteEntry

import com.android.credentialmanager.IS_AUTO_SELECTED_KEY

import com.android.credentialmanager.R

import com.android.credentialmanager.model.get.ActionEntryInfo

import com.android.credentialmanager.model.get.AuthenticationEntryInfo

import com.android.credentialmanager.model.get.CredentialEntryInfo
@@ -147,7 +148,9 @@ private fun getCredentialOptionInfoList( 
                    credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(),

                    userName = credentialEntry.username.toString(),

                    displayName = credentialEntry.displayName?.toString(),

                    icon = credentialEntry.icon.loadDrawable(context),

                    icon = if (credentialEntry.hasDefaultIcon)

                        context.getDrawable(R.drawable.ic_passkey_24)

                    else credentialEntry.icon.loadDrawable(context),

                    shouldTintIcon = credentialEntry.hasDefaultIcon,

                    lastUsedTimeMillis = credentialEntry.lastUsedTime,

                    isAutoSelectable = credentialEntry.isAutoSelectAllowed &&

packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt

+6 −4
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ class CreateFlowUtils { 
            val appPreferredDefaultProviderId: String? =

                if (!requestInfo.hasPermissionToOverrideDefault()) null

                else createCredentialRequestJetpack?.displayInfo?.preferDefaultProvider

            val typeDisplayIcon = createCredentialRequestJetpack?.displayInfo?.credentialTypeIcon

                    ?.loadDrawable(context)

            return when (createCredentialRequestJetpack) {

                is CreatePasswordRequest -> RequestDisplayInfo(

                    createCredentialRequestJetpack.id,
@@ -302,7 +304,6 @@ class CreateFlowUtils { 
                    newRequestDisplayInfoFromPasskeyJson(

                        requestJson = createCredentialRequestJetpack.requestJson,

                        appLabel = appLabel,

                        context = context,

                        preferImmediatelyAvailableCredentials =

                        createCredentialRequestJetpack.preferImmediatelyAvailableCredentials,

                        appPreferredDefaultProviderId = appPreferredDefaultProviderId,
@@ -311,6 +312,7 @@ class CreateFlowUtils { 
                        // the passkey type. For now, directly parse it ourselves.

                        isAutoSelectRequest = createCredentialRequest.credentialData.getBoolean(

                            Constants.BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS, false),

                        typeIcon = context.getDrawable(R.drawable.ic_passkey_24) ?: return null,

                    )

                }

                is CreateCustomCredentialRequest -> {
@@ -323,7 +325,7 @@ class CreateFlowUtils { 
                        subtitle = displayInfo.userDisplayName?.toString(),

                        type = CredentialType.UNKNOWN,

                        appName = appLabel,

                        typeIcon = displayInfo.credentialTypeIcon?.loadDrawable(context)

                        typeIcon = typeDisplayIcon

                            ?: context.getDrawable(R.drawable.ic_other_sign_in_24) ?: return null,

                        preferImmediatelyAvailableCredentials =

                        createCredentialRequestJetpack.preferImmediatelyAvailableCredentials,
@@ -502,7 +504,7 @@ class CreateFlowUtils { 
        private fun newRequestDisplayInfoFromPasskeyJson(

            requestJson: String,

            appLabel: String,

            context: Context,

            typeIcon: Drawable,

            preferImmediatelyAvailableCredentials: Boolean,

            appPreferredDefaultProviderId: String?,

            userSetDefaultProviderIds: Set<String>,
@@ -525,7 +527,7 @@ class CreateFlowUtils { 
                displayname,

                CredentialType.PASSKEY,

                appLabel,

                context.getDrawable(R.drawable.ic_passkey_24) ?: return null,

                typeIcon,

                preferImmediatelyAvailableCredentials,

                appPreferredDefaultProviderId,

                userSetDefaultProviderIds,