Merge "Correctly color + place Shareousel preview icons" into main

2 files changed, 16 insertions, 3 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt b/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt
index a10d3272..51a3cb14 100644
--- a/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt
+++ b/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt
@@ -20,8 +20,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.android.intentresolver.R
 import com.android.intentresolver.contentpreview.ChooserContentPreviewUi.ActionFactory
@@ -75,7 +80,16 @@ internal class ShareouselContentPreviewUi(
                         }
                     }
 
-                    Shareousel(viewModel = viewModel)
+                    MaterialTheme(
+                        colorScheme =
+                            if (isSystemInDarkTheme()) {
+                                dynamicDarkColorScheme(LocalContext.current)
+                            } else {
+                                dynamicLightColorScheme(LocalContext.current)
+                            },
+                    ) {
+                        Shareousel(viewModel = viewModel)
+                    }
                 }
             }
         return composeView
diff --git a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt
index a1ccd9dd..9f31c0e4 100644
--- a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt
+++ b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt
@@ -18,7 +18,6 @@ package com.android.intentresolver.contentpreview.shareousel.ui.composable
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
@@ -49,7 +48,7 @@ fun ShareouselCard(
     Box(modifier) {
         image()
         val topButtonPadding = 12.dp
-        Box(modifier = Modifier.padding(topButtonPadding).fillMaxSize()) {
+        Box(modifier = Modifier.padding(topButtonPadding).matchParentSize()) {
             SelectionIcon(selected, modifier = Modifier.align(Alignment.TopStart))
             AnimationIcon(modifier = Modifier.align(Alignment.TopEnd))
             ActionButton(