From 768a52f812ea55bbb1273ab789bb3cff39858295 Mon Sep 17 00:00:00 2001 From: Harsh Lal Date: Sat, 4 Feb 2023 05:53:21 +0000 Subject: [PATCH] Replace png welcome screen image with svg counterpart for dark theme support Bug: 266005401 Fix: 266005401 Test: local deployment Change-Id: I1a396fc8beda4726b0ec56c0586e45148c088dce --- .../res/drawable/ic_passkeys_onboarding.png | Bin 12179 -> 0 bytes .../res/drawable/ic_passkeys_onboarding.xml | 158 ++++++++++++++++++ .../drawable/ic_passkeys_onboarding_dark.xml | 158 ++++++++++++++++++ .../createflow/CreateCredentialComponents.kt | 11 +- 4 files changed, 326 insertions(+), 1 deletion(-) delete mode 100644 packages/CredentialManager/res/drawable/ic_passkeys_onboarding.png create mode 100644 packages/CredentialManager/res/drawable/ic_passkeys_onboarding.xml create mode 100644 packages/CredentialManager/res/drawable/ic_passkeys_onboarding_dark.xml diff --git a/packages/CredentialManager/res/drawable/ic_passkeys_onboarding.png b/packages/CredentialManager/res/drawable/ic_passkeys_onboarding.png deleted file mode 100644 index 388d098372524e9f6c77058246b3a07c34696758..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12179 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 diff --git a/packages/CredentialManager/res/drawable/ic_passkeys_onboarding.xml b/packages/CredentialManager/res/drawable/ic_passkeys_onboarding.xml new file mode 100644 index 0000000000000..91b23cc4d2a97 --- /dev/null +++ b/packages/CredentialManager/res/drawable/ic_passkeys_onboarding.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/CredentialManager/res/drawable/ic_passkeys_onboarding_dark.xml b/packages/CredentialManager/res/drawable/ic_passkeys_onboarding_dark.xml new file mode 100644 index 0000000000000..53933cb771363 --- /dev/null +++ b/packages/CredentialManager/res/drawable/ic_passkeys_onboarding_dark.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt index 558c229743c86..823ee5b1f5e41 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt @@ -5,6 +5,7 @@ package com.android.credentialmanager.createflow import androidx.activity.compose.ManagedActivityResultLauncher import androidx.activity.result.ActivityResult import androidx.activity.result.IntentSenderRequest +import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -165,8 +166,16 @@ fun ConfirmationCard( ) { ContainerCard() { Column() { + val onboardingImageResource = remember { + mutableStateOf(R.drawable.ic_passkeys_onboarding) + } + if (isSystemInDarkTheme()) { + onboardingImageResource.value = R.drawable.ic_passkeys_onboarding_dark + } else { + onboardingImageResource.value = R.drawable.ic_passkeys_onboarding + } Image( - painter = painterResource(R.drawable.ic_passkeys_onboarding), + painter = painterResource(onboardingImageResource.value), contentDescription = null, modifier = Modifier.align(alignment = Alignment.CenterHorizontally) .padding(top = 24.dp, bottom = 12.dp).size(316.dp, 168.dp)