Merge "Request preview size, WIDTH and HEIGHT columns for additional content" into main

2 files changed, 9 insertions, 2 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt
index 148310e6..2b14cdea 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt
@@ -20,6 +20,8 @@ import android.content.ContentInterface
 import android.content.Intent
 import android.database.Cursor
 import android.net.Uri
+import android.provider.MediaStore.MediaColumns.HEIGHT
+import android.provider.MediaStore.MediaColumns.WIDTH
 import android.service.chooser.AdditionalContentContract.Columns.URI
 import androidx.core.os.bundleOf
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.model.CursorRow
@@ -48,8 +50,7 @@ constructor(
         runCatching {
                 contentResolver.query(
                     cursorUri,
-                    // TODO: uncomment to start using that data
-                    arrayOf(URI /*, WIDTH, HEIGHT*/),
+                    arrayOf(URI, WIDTH, HEIGHT),
                     bundleOf(Intent.EXTRA_INTENT to chooserIntent),
                     signal,
                 )
diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolverTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolverTest.kt
index 5d81ec2a..f0813623 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolverTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolverTest.kt
@@ -30,9 +30,12 @@ import com.google.common.truth.Truth.assertWithMessage
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.capture
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 
 class PayloadToggleCursorResolverTest {
     private val cursorUri = Uri.parse("content://org.pkg.app.extra")
@@ -101,6 +104,9 @@ class PayloadToggleCursorResolverTest {
             assertThat(row!!.uri).isEqualTo(uri)
             assertThat(row.previewSize).isEqualTo(Size(100, 50))
         }
+        val columnsCaptor = argumentCaptor<Array<String>>()
+        verify(fakeContentProvider).query(eq(cursorUri), columnsCaptor.capture(), any(), any())
+        assertThat(columnsCaptor.firstValue.toList()).containsExactly(URI, WIDTH, HEIGHT)
     }
 
     @Test