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

Commit 5460dfd3 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Update app to web animation" into main

parents 4b7d8df2 0f69c7ab

libs/WindowManager/Shell/res/raw/app_to_web_education_image.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education/LottieAnimationUtils.kt

+4 −4
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ import kotlinx.coroutines.withContext 


private fun getMaterialColorMap(colorScheme: ColorScheme) =

    mapOf(

        ".Primary" to colorScheme.primary,

        ".primary" to colorScheme.primary,

        ".onPrimary" to colorScheme.onPrimary,

        ".Tertiary" to colorScheme.tertiary,

        ".Surface" to colorScheme.surface,

        ".tertiary" to colorScheme.tertiary,

        ".surface" to colorScheme.surface,

        ".onSurface" to colorScheme.onSurface,

        ".sContainerHighest" to colorScheme.surfaceContainerHighest,

        ".InverseSurface" to colorScheme.inverseSurface,

        ".inverseSurface" to colorScheme.inverseSurface,

    )



private fun applyDynamicColors(