Remove SHARESHEET_CUSTOM_ACTIONS flag usage

Has been released for a while without issue.

Everyone loves it.

Bug: 266983432
Test: atest IntentResolverUnitTests
Change-Id: I8fdf7014415d53df2dabd55ec7bbdfb1426e093e

7 files changed, 13 insertions, 28 deletions

diff --git a/java/src/com/android/intentresolver/ChooserRequestParameters.java b/java/src/com/android/intentresolver/ChooserRequestParameters.java
index 8e0014d6..d11561df 100644
--- a/java/src/com/android/intentresolver/ChooserRequestParameters.java
+++ b/java/src/com/android/intentresolver/ChooserRequestParameters.java
@@ -146,9 +146,7 @@ public class ChooserRequestParameters {
 
         mTargetIntentFilter = getTargetIntentFilter(mTarget);
 
-        mChooserActions = featureFlags.isEnabled(Flags.SHARESHEET_CUSTOM_ACTIONS)
-                ? getChooserActions(clientIntent)
-                : ImmutableList.of();
+        mChooserActions = getChooserActions(clientIntent);
         mModifyShareAction = featureFlags.isEnabled(Flags.SHARESHEET_RESELECTION_ACTION)
                 ? getModifyShareAction(clientIntent)
                 : null;
diff --git a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
index 2a6bff5c..05d0ee66 100644
--- a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
@@ -54,10 +54,8 @@ abstract class ContentPreviewUi {
     public abstract ViewGroup display(
             Resources resources, LayoutInflater layoutInflater, ViewGroup parent);
 
-    protected static int getActionRowLayout(FeatureFlagRepository featureFlagRepository) {
-        return featureFlagRepository.isEnabled(Flags.SHARESHEET_CUSTOM_ACTIONS)
-                ? R.layout.scrollable_chooser_action_row
-                : R.layout.chooser_action_row;
+    protected static int getActionRowLayout() {
+        return R.layout.scrollable_chooser_action_row;
     }
 
     protected static ActionRow inflateActionRow(ViewGroup parent, @LayoutRes int actionRowLayout) {
@@ -71,12 +69,10 @@ abstract class ContentPreviewUi {
 
     protected static List<ActionRow.Action> createActions(
             List<ActionRow.Action> systemActions,
-            List<ActionRow.Action> customActions,
-            FeatureFlagRepository featureFlagRepository) {
+            List<ActionRow.Action> customActions) {
         ArrayList<ActionRow.Action> actions =
                 new ArrayList<>(systemActions.size() + customActions.size());
-        if (featureFlagRepository.isEnabled(Flags.SHARESHEET_CUSTOM_ACTIONS)
-                && customActions != null && !customActions.isEmpty()) {
+        if (customActions != null && !customActions.isEmpty()) {
             actions.addAll(customActions);
         } else {
             actions.addAll(systemActions);
diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
index 52e20cf0..cc087a63 100644
--- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
@@ -74,7 +74,7 @@ class FileContentPreviewUi extends ContentPreviewUi {
 
     private ViewGroup displayInternal(
             Resources resources, LayoutInflater layoutInflater, ViewGroup parent) {
-        @LayoutRes int actionRowLayout = getActionRowLayout(mFeatureFlagRepository);
+        @LayoutRes int actionRowLayout = getActionRowLayout();
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_file, parent, false);
 
@@ -119,8 +119,7 @@ class FileContentPreviewUi extends ContentPreviewUi {
             actionRow.setActions(
                     createActions(
                             createFilePreviewActions(),
-                            mActionFactory.createCustomActions(),
-                            mFeatureFlagRepository));
+                            mActionFactory.createCustomActions()));
         }
 
         return contentPreviewLayout;
diff --git a/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java
index f2c0564a..1ca2ba61 100644
--- a/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ImageContentPreviewUi.java
@@ -88,7 +88,7 @@ class ImageContentPreviewUi extends ContentPreviewUi {
     }
 
     private ViewGroup displayInternal(LayoutInflater layoutInflater, ViewGroup parent) {
-        @LayoutRes int actionRowLayout = getActionRowLayout(mFeatureFlagRepository);
+        @LayoutRes int actionRowLayout = getActionRowLayout();
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_image, parent, false);
         ChooserImagePreviewView imagePreview = inflateImagePreviewView(contentPreviewLayout);
@@ -98,8 +98,7 @@ class ImageContentPreviewUi extends ContentPreviewUi {
             actionRow.setActions(
                     createActions(
                             createImagePreviewActions(),
-                            mActionFactory.createCustomActions(),
-                            mFeatureFlagRepository));
+                            mActionFactory.createCustomActions()));
         }
 
         if (mImageUris.size() == 0) {
diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
index d0cba5bb..8a3c2259 100644
--- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
@@ -80,7 +80,7 @@ class TextContentPreviewUi extends ContentPreviewUi {
     private ViewGroup displayInternal(
             LayoutInflater layoutInflater,
             ViewGroup parent) {
-        @LayoutRes int actionRowLayout = getActionRowLayout(mFeatureFlagRepository);
+        @LayoutRes int actionRowLayout = getActionRowLayout();
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_text, parent, false);
 
@@ -89,8 +89,7 @@ class TextContentPreviewUi extends ContentPreviewUi {
             actionRow.setActions(
                     createActions(
                             createTextPreviewActions(),
-                            mActionFactory.createCustomActions(),
-                            mFeatureFlagRepository));
+                            mActionFactory.createCustomActions()));
         }
 
         if (mSharingText == null) {
diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
index 2d2ae52b..dfc171d2 100644
--- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
@@ -94,7 +94,7 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
     }
 
     private ViewGroup displayInternal(LayoutInflater layoutInflater, ViewGroup parent) {
-        @LayoutRes int actionRowLayout = getActionRowLayout(mFeatureFlagRepository);
+        @LayoutRes int actionRowLayout = getActionRowLayout();
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_image, parent, false);
         ScrollableImagePreviewView imagePreview = inflateImagePreviewView(contentPreviewLayout);
@@ -104,8 +104,7 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
             actionRow.setActions(
                     createActions(
                             createImagePreviewActions(),
-                            mActionFactory.createCustomActions(),
-                            mFeatureFlagRepository));
+                            mActionFactory.createCustomActions()));
         }
 
         if (mFiles.size() == 0) {
diff --git a/java/src/com/android/intentresolver/flags/Flags.kt b/java/src/com/android/intentresolver/flags/Flags.kt
index 40f32bf3..846f8e64 100644
--- a/java/src/com/android/intentresolver/flags/Flags.kt
+++ b/java/src/com/android/intentresolver/flags/Flags.kt
@@ -22,15 +22,10 @@ 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_CUSTOM_ACTIONS_NAME = "sharesheet_custom_actions"
     const val SHARESHEET_RESELECTION_ACTION_NAME = "sharesheet_reselection_action"
     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/266983432) Tracking Bug
-    @JvmField
-    val SHARESHEET_CUSTOM_ACTIONS = releasedFlag(1501, SHARESHEET_CUSTOM_ACTIONS_NAME)
-
     // TODO(b/266982749) Tracking Bug
     @JvmField
     val SHARESHEET_RESELECTION_ACTION = releasedFlag(1502, SHARESHEET_RESELECTION_ACTION_NAME)