Remove SHARESHEET_SCROLLABLE_IMAGE_PREVIEW

Also simplify some flag testing stuff when there are no flags being
tested.

Bug: 267355521
Test: atest IntentResolverUnitTests
Change-Id: I2ec39d38605d4e1b9df5bb22542623cdeb1e51da

2 files changed, 10 insertions, 89 deletions

diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
index d074e978..eb340224 100644
--- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
+++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
@@ -104,7 +104,6 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import com.android.intentresolver.chooser.DisplayResolveInfo;
-import com.android.intentresolver.flags.Flags;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -168,8 +167,7 @@ public class UnbundledChooserActivityTest {
             };
 
     private static final List<BooleanFlag> ALL_FLAGS =
-            Arrays.asList(
-                    Flags.SHARESHEET_SCROLLABLE_IMAGE_PREVIEW);
+            Arrays.asList();
 
     private static final Map<BooleanFlag, Boolean> ALL_FLAGS_OFF =
             createAllFlagsOverride(false);
@@ -178,6 +176,15 @@ public class UnbundledChooserActivityTest {
 
     @Parameterized.Parameters
     public static Collection packageManagers() {
+        if (ALL_FLAGS.isEmpty()) {
+            // No flags to toggle between, so just two configurations.
+            return Arrays.asList(new Object[][] {
+                    // Default PackageManager and all flags off
+                    { DEFAULT_PM, ALL_FLAGS_OFF},
+                    // No App Prediction Service and all flags off
+                    { NO_APP_PREDICTION_SERVICE_PM, ALL_FLAGS_OFF },
+            });
+        }
         return Arrays.asList(new Object[][] {
                 // Default PackageManager and all flags off
                 { DEFAULT_PM, ALL_FLAGS_OFF},
@@ -933,74 +940,6 @@ public class UnbundledChooserActivityTest {
     }
 
     @Test
-    @RequireFeatureFlags(
-            flags = { Flags.SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME },
-            values = { false })
-    public void twoVisibleImagePreview() {
-        Uri uri = Uri.parse("android.resource://com.android.frameworks.coretests/"
-                + R.drawable.test320x240);
-
-        ArrayList<Uri> uris = new ArrayList<>();
-        uris.add(uri);
-        uris.add(uri);
-
-        Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().previewThumbnail = createBitmap();
-        ChooserActivityOverrideData.getInstance().isImageType = true;
-
-        List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
-
-        setupResolverControllers(resolvedComponentInfos);
-        mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
-        waitForIdle();
-        onView(withId(com.android.internal.R.id.content_preview_image_1_large))
-                .check(matches(isDisplayed()));
-        onView(withId(com.android.internal.R.id.content_preview_image_2_large))
-                .check(matches(isDisplayed()));
-        onView(withId(com.android.internal.R.id.content_preview_image_2_small))
-                .check(matches(not(isDisplayed())));
-        onView(withId(com.android.internal.R.id.content_preview_image_3_small))
-                .check(matches(not(isDisplayed())));
-    }
-
-    @Test
-    @RequireFeatureFlags(
-            flags = { Flags.SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME },
-            values = { false })
-    public void threeOrMoreVisibleImagePreview() {
-        Uri uri = Uri.parse("android.resource://com.android.frameworks.coretests/"
-                + R.drawable.test320x240);
-
-        ArrayList<Uri> uris = new ArrayList<>();
-        uris.add(uri);
-        uris.add(uri);
-        uris.add(uri);
-        uris.add(uri);
-        uris.add(uri);
-
-        Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().previewThumbnail = createBitmap();
-        ChooserActivityOverrideData.getInstance().isImageType = true;
-
-        List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
-
-        setupResolverControllers(resolvedComponentInfos);
-        mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
-        waitForIdle();
-        onView(withId(com.android.internal.R.id.content_preview_image_1_large))
-                .check(matches(isDisplayed()));
-        onView(withId(com.android.internal.R.id.content_preview_image_2_large))
-                .check(matches(not(isDisplayed())));
-        onView(withId(com.android.internal.R.id.content_preview_image_2_small))
-                .check(matches(isDisplayed()));
-        onView(withId(com.android.internal.R.id.content_preview_image_3_small))
-                .check(matches(isDisplayed()));
-    }
-
-    @Test
-    @RequireFeatureFlags(
-            flags = { Flags.SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME },
-            values = { true })
     public void testManyVisibleImagePreview_ScrollableImagePreview() {
         Uri uri = Uri.parse("android.resource://com.android.frameworks.coretests/"
                 + R.drawable.test320x240);
diff --git a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
index 82bf94c4..7b9a0ce6 100644
--- a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
+++ b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
@@ -22,11 +22,9 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
 import com.android.intentresolver.ImageLoader
-import com.android.intentresolver.TestFeatureFlagRepository
 import com.android.intentresolver.any
 import com.android.intentresolver.anyOrNull
 import com.android.intentresolver.contentpreview.ChooserContentPreviewUi.ActionFactory
-import com.android.intentresolver.flags.Flags
 import com.android.intentresolver.mock
 import com.android.intentresolver.whenever
 import com.android.intentresolver.widget.ActionRow
@@ -61,11 +59,6 @@ class ChooserContentPreviewUiTest {
         override fun getExcludeSharedTextAction(): Consumer<Boolean> = Consumer<Boolean> {}
     }
     private val transitionCallback = mock<ImagePreviewView.TransitionElementStatusCallback>()
-    private val featureFlagRepository = TestFeatureFlagRepository(
-        mapOf(
-            Flags.SHARESHEET_SCROLLABLE_IMAGE_PREVIEW to true
-        )
-    )
 
     @Test
     fun test_ChooserContentPreview_non_send_intent_action_to_text_preview() {
@@ -77,7 +70,6 @@ class ChooserContentPreviewUiTest {
             imageLoader,
             actionFactory,
             transitionCallback,
-            featureFlagRepository,
             headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -98,7 +90,6 @@ class ChooserContentPreviewUiTest {
             imageLoader,
             actionFactory,
             transitionCallback,
-            featureFlagRepository,
             headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -120,7 +111,6 @@ class ChooserContentPreviewUiTest {
             imageLoader,
             actionFactory,
             transitionCallback,
-            featureFlagRepository,
             headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -142,7 +132,6 @@ class ChooserContentPreviewUiTest {
             imageLoader,
             actionFactory,
             transitionCallback,
-            featureFlagRepository,
             headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -165,7 +154,6 @@ class ChooserContentPreviewUiTest {
                 imageLoader,
                 actionFactory,
                 transitionCallback,
-                featureFlagRepository,
                 headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -191,7 +179,6 @@ class ChooserContentPreviewUiTest {
                 imageLoader,
                 actionFactory,
                 transitionCallback,
-                featureFlagRepository,
                 headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -215,7 +202,6 @@ class ChooserContentPreviewUiTest {
                 imageLoader,
                 actionFactory,
                 transitionCallback,
-                featureFlagRepository,
                 headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -245,7 +231,6 @@ class ChooserContentPreviewUiTest {
             imageLoader,
             actionFactory,
             transitionCallback,
-            featureFlagRepository,
             headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -275,7 +260,6 @@ class ChooserContentPreviewUiTest {
             imageLoader,
             actionFactory,
             transitionCallback,
-            featureFlagRepository,
             headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -307,7 +291,6 @@ class ChooserContentPreviewUiTest {
                 imageLoader,
                 actionFactory,
                 transitionCallback,
-                featureFlagRepository,
                 headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)
@@ -337,7 +320,6 @@ class ChooserContentPreviewUiTest {
                 imageLoader,
                 actionFactory,
                 transitionCallback,
-                featureFlagRepository,
                 headlineGenerator
         )
         assertThat(testSubject.preferredContentPreview)