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

Commit 9a87cf74 authored by Qinmei Du's avatar Qinmei Du
Browse files

Update the icon/style to make it align with the design 

screenshot: https://screenshot.googleplex.com/6czedHMer3jm5yD
Test: deployed locally

Bug: 266005002
Bug: 265067355

Fix: 266005002
Change-Id: I814e21d6f23bebf01ab160a80ff2fd14b606e5c7
parent e7a8a48f

packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt

+8 −6
Original line number Diff line number Diff line
@@ -477,7 +477,8 @@ fun MoreOptionsRowIntroCard( 
                Icons.Outlined.NewReleases,

                contentDescription = null,

                modifier = Modifier.align(alignment = Alignment.CenterHorizontally)

                    .padding(all = 24.dp)

                    .padding(all = 24.dp),

                tint = LocalAndroidColorScheme.current.colorAccentPrimaryVariant,

            )

            TextOnSurface(

                text = stringResource(
@@ -642,7 +643,7 @@ fun ExternalOnlySelectionCard( 
            Icon(

                painter = painterResource(R.drawable.ic_other_devices),

                contentDescription = null,

                tint = Color.Unspecified,

                tint = LocalAndroidColorScheme.current.colorAccentPrimaryVariant,

                modifier = Modifier.align(alignment = Alignment.CenterHorizontally)

                    .padding(all = 24.dp).size(32.dp)

            )
@@ -972,7 +973,8 @@ fun MoreOptionsDisabledProvidersRow( 
                Icon(

                    Icons.Filled.Add,

                    contentDescription = null,

                    modifier = Modifier.padding(start = 16.dp)

                    modifier = Modifier.padding(start = 16.dp),

                    tint = LocalAndroidColorScheme.current.colorAccentPrimaryVariant,

                )

            },

            label = {
@@ -1006,8 +1008,8 @@ fun RemoteEntryRow( 
            Icon(

                painter = painterResource(R.drawable.ic_other_devices),

                contentDescription = null,

                tint = Color.Unspecified,

                modifier = Modifier.padding(start = 18.dp)

                tint = LocalAndroidColorScheme.current.colorAccentPrimaryVariant,

                modifier = Modifier.padding(start = 10.dp)

            )

        },

        label = {
@@ -1015,7 +1017,7 @@ fun RemoteEntryRow( 
                TextOnSurfaceVariant(

                    text = stringResource(R.string.another_device),

                    style = MaterialTheme.typography.titleLarge,

                    modifier = Modifier.padding(start = 16.dp, top = 18.dp, bottom = 18.dp)

                    modifier = Modifier.padding(start = 10.dp, top = 18.dp, bottom = 18.dp)

                        .align(alignment = Alignment.CenterHorizontally),

                )

            }

packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt

+4 −4
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ fun AllSignInOptionCard( 
    ContainerCard() {

        Column() {

            TopAppBar(

                colors = TopAppBarDefaults.smallTopAppBarColors(

                colors = TopAppBarDefaults.topAppBarColors(

                    containerColor = Color.Transparent,

                ),

                title = {
@@ -415,8 +415,8 @@ fun RemoteEntryCard( 
                    Icon(

                        painter = painterResource(R.drawable.ic_other_devices),

                        contentDescription = null,

                        tint = Color.Unspecified,

                        modifier = Modifier.padding(start = 16.dp)

                        tint = LocalAndroidColorScheme.current.colorAccentPrimaryVariant,

                        modifier = Modifier.padding(start = 10.dp)

                    )

                },

                label = {
@@ -424,7 +424,7 @@ fun RemoteEntryCard( 
                        text = stringResource(

                            R.string.get_dialog_option_headline_use_a_different_device),

                        style = MaterialTheme.typography.titleLarge,

                        modifier = Modifier.padding(start = 16.dp, top = 18.dp, bottom = 18.dp)

                        modifier = Modifier.padding(start = 10.dp, top = 18.dp, bottom = 18.dp)

                            .align(alignment = Alignment.CenterHorizontally)

                    )

                }