Remove usage of SHARESHEET_IMAGE_AND_TEXT_PREVIEW

Bug: 266983474
Test: atest IntentResolverUnitTests
Change-Id: I5571fde968fb1bc0280ccdfe43f26d2843bec7ae

3 files changed, 2 insertions, 17 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java
index cf7c5525..85ae2adb 100644
--- a/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java
@@ -37,7 +37,6 @@ import androidx.annotation.Nullable;
 import com.android.intentresolver.ImageLoader;
 import com.android.intentresolver.R;
 import com.android.intentresolver.flags.FeatureFlagRepository;
-import com.android.intentresolver.flags.Flags;
 import com.android.intentresolver.widget.ActionRow;
 import com.android.intentresolver.widget.ChooserImagePreviewView;
 import com.android.intentresolver.widget.ImagePreviewView.TransitionElementStatusCallback;
@@ -157,10 +156,7 @@ class ImageContentPreviewUi extends ContentPreviewUi {
 
     private void setTextInImagePreviewVisibility(
             ViewGroup contentPreview, ChooserContentPreviewUi.ActionFactory actionFactory) {
-        int visibility = mFeatureFlagRepository.isEnabled(Flags.SHARESHEET_IMAGE_AND_TEXT_PREVIEW)
-                && !TextUtils.isEmpty(mText)
-                ? View.VISIBLE
-                : View.GONE;
+        int visibility = !TextUtils.isEmpty(mText) ? View.VISIBLE : View.GONE;
 
         final TextView textView = contentPreview
                 .requireViewById(com.android.internal.R.id.content_preview_text);
diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
index 55e8058b..a849ddb9 100644
--- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
@@ -36,7 +36,6 @@ import androidx.annotation.Nullable;
 import com.android.intentresolver.ImageLoader;
 import com.android.intentresolver.R;
 import com.android.intentresolver.flags.FeatureFlagRepository;
-import com.android.intentresolver.flags.Flags;
 import com.android.intentresolver.widget.ActionRow;
 import com.android.intentresolver.widget.ImagePreviewView.TransitionElementStatusCallback;
 import com.android.intentresolver.widget.ScrollableImagePreviewView;
@@ -139,10 +138,7 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
                 mFiles.size() - previews.size(),
                 mImageLoader);
 
-        if (mFeatureFlagRepository.isEnabled(Flags.SHARESHEET_IMAGE_AND_TEXT_PREVIEW)
-                && !TextUtils.isEmpty(mText)
-                && mFiles.size() == 1
-                && allImages) {
+        if (!TextUtils.isEmpty(mText) && mFiles.size() == 1 && allImages) {
             setTextInImagePreviewVisibility(contentPreviewLayout, mActionFactory);
             updateTextWithImageHeadline(contentPreviewLayout);
         } else {
diff --git a/java/src/com/android/intentresolver/flags/Flags.kt b/java/src/com/android/intentresolver/flags/Flags.kt
index 2b3da725..0440b3d6 100644
--- a/java/src/com/android/intentresolver/flags/Flags.kt
+++ b/java/src/com/android/intentresolver/flags/Flags.kt
@@ -22,15 +22,8 @@ import com.android.systemui.flags.UnreleasedFlag
 // Flag id, name and namespace should be kept in sync with [com.android.systemui.flags.Flags] to
 // make the flags available in the flag flipper app (see go/sysui-flags).
 object Flags {
-    const val SHARESHEET_IMAGE_AND_TEXT_PREVIEW_NAME = "sharesheet_image_text_preview"
     const val SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME = "sharesheet_scrollable_image_preview"
 
-    // TODO(b/266983474) Tracking Bug
-    @JvmField
-    val SHARESHEET_IMAGE_AND_TEXT_PREVIEW = releasedFlag(
-        id = 1503, name = SHARESHEET_IMAGE_AND_TEXT_PREVIEW_NAME
-    )
-
     // TODO(b/267355521) Tracking Bug
     @JvmField
     val SHARESHEET_SCROLLABLE_IMAGE_PREVIEW = releasedFlag(