From 37c9ff0d37ff33babf6ee845aaf4d470660765f7 Mon Sep 17 00:00:00 2001
From: Steve Elliott <steell@google.com>
Date: Mon, 12 Feb 2024 12:18:44 -0500
Subject: Remove shareousel preview action button

Bug: 302691505
Flag: ACONFIG android.service.chooser.chooser_payload_toggling DEVELOPMENT
Test: N/A - code isn't live
Change-Id: I52709bc0740792e1a63cc5a2519559df67b746f7
---
 .../ui/composable/ShareouselCardComposable.kt      | 30 ----------------------
 .../ui/composable/ShareouselComposable.kt          |  1 -
 .../shareousel/ui/viewmodel/ShareouselViewModel.kt |  2 --
 3 files changed, 33 deletions(-)

(limited to 'java/src')

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 9f31c0e4..dc96e3c1 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
@@ -21,11 +21,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -42,7 +38,6 @@ import com.android.intentresolver.R
 fun ShareouselCard(
     image: @Composable () -> Unit,
     selected: Boolean,
-    onActionClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier) {
@@ -51,35 +46,10 @@ fun ShareouselCard(
         Box(modifier = Modifier.padding(topButtonPadding).matchParentSize()) {
             SelectionIcon(selected, modifier = Modifier.align(Alignment.TopStart))
             AnimationIcon(modifier = Modifier.align(Alignment.TopEnd))
-            ActionButton(
-                onActionClick,
-                modifier =
-                    Modifier.background(
-                            MaterialTheme.colorScheme.secondary,
-                            shape = RoundedCornerShape(12.dp),
-                        )
-                        .size(32.dp)
-                        .align(Alignment.BottomEnd)
-            )
         }
     }
 }
 
-@Composable
-private fun ActionButton(
-    onActionClick: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    IconButton(onClick = { onActionClick() }, modifier = modifier) {
-        Icon(
-            Icons.Outlined.Edit,
-            contentDescription = "edit",
-            tint = Color(0xFF1B1C14),
-            modifier = Modifier.padding(8.dp)
-        )
-    }
-}
-
 @Composable
 private fun AnimationIcon(modifier: Modifier = Modifier) {
     Icon(
diff --git a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt
index c83c10b0..eb8c4f88 100644
--- a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt
+++ b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt
@@ -117,7 +117,6 @@ private fun ShareouselCard(viewModel: ShareouselImageViewModel) {
                 }
         },
         selected = selected,
-        onActionClick = { viewModel.onActionClick() },
         modifier =
             Modifier.thenIf(selected) {
                     Modifier.border(
diff --git a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt
index 4592ea6d..4a9e1d86 100644
--- a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt
+++ b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt
@@ -38,7 +38,6 @@ data class ShareouselImageViewModel(
     val contentDescription: Flow<String>,
     val isSelected: Flow<Boolean>,
     val setSelected: (Boolean) -> Unit,
-    val onActionClick: () -> Unit,
 )
 
 fun PayloadToggleInteractor.toShareouselViewModel(imageLoader: ImageLoader): ShareouselViewModel {
@@ -54,7 +53,6 @@ fun PayloadToggleInteractor.toShareouselViewModel(imageLoader: ImageLoader): Sha
                 contentDescription = MutableStateFlow(""),
                 isSelected = previewInteractor.selected,
                 setSelected = { isSelected -> previewInteractor.setSelected(isSelected) },
-                onActionClick = {},
             )
         }
     )
-- 
cgit v1.2.3-59-g8ed1b