Remove bespoke_label_view

Launched.

Bug: 302188527
Test: presubmits
Flag: EXEMPT removing com.android.intentresolver.bespoke_label_view
Change-Id: Ia3f3b80b6e854f4ecd569936e144815e5ab592d7

6 files changed, 13 insertions, 49 deletions

diff --git a/aconfig/FeatureFlags.aconfig b/aconfig/FeatureFlags.aconfig
index 0cadaab1..a95a9ea8 100644
--- a/aconfig/FeatureFlags.aconfig
+++ b/aconfig/FeatureFlags.aconfig
@@ -20,13 +20,6 @@ flag {
 }
 
 flag {
-  name: "bespoke_label_view"
-  namespace: "intentresolver"
-  description: "Use a custom view to draw target labels"
-  bug: "302188527"
-}
-
-flag {
   name: "enable_private_profile"
   namespace: "intentresolver"
   description: "Enable private profile support"
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 4d70f550..cdf1a8ad 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -2043,8 +2043,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
                     if (record != null && record.shortcutLoader != null) {
                         record.shortcutLoader.reset();
                     }
-                },
-                mFeatureFlags);
+                });
     }
 
     private void onWorkProfileStatusUpdated() {
diff --git a/java/src/com/android/intentresolver/ChooserListAdapter.java b/java/src/com/android/intentresolver/ChooserListAdapter.java
index ff0c40d7..07a615a5 100644
--- a/java/src/com/android/intentresolver/ChooserListAdapter.java
+++ b/java/src/com/android/intentresolver/ChooserListAdapter.java
@@ -111,7 +111,6 @@ public class ChooserListAdapter extends ResolverListAdapter {
     // Reserve spots for incoming direct share targets by adding placeholders
     private final TargetInfo mPlaceHolderTargetInfo;
     private final TargetDataLoader mTargetDataLoader;
-    private final boolean mUseBadgeTextViewForLabels;
     private final List<TargetInfo> mServiceTargets = new ArrayList<>();
     private final List<DisplayResolveInfo> mCallerTargets = new ArrayList<>();
 
@@ -171,8 +170,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
             int maxRankedTargets,
             UserHandle initialIntentsUserSpace,
             TargetDataLoader targetDataLoader,
-            @Nullable PackageChangeCallback packageChangeCallback,
-            FeatureFlags featureFlags) {
+            @Nullable PackageChangeCallback packageChangeCallback) {
         this(
                 context,
                 payloadIntents,
@@ -191,8 +189,8 @@ public class ChooserListAdapter extends ResolverListAdapter {
                 targetDataLoader,
                 packageChangeCallback,
                 AsyncTask.SERIAL_EXECUTOR,
-                context.getMainExecutor(),
-                featureFlags);
+                context.getMainExecutor()
+        );
     }
 
     @VisibleForTesting
@@ -214,8 +212,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
             TargetDataLoader targetDataLoader,
             @Nullable PackageChangeCallback packageChangeCallback,
             Executor bgExecutor,
-            Executor mainExecutor,
-            FeatureFlags featureFlags) {
+            Executor mainExecutor) {
         // Don't send the initial intents through the shared ResolverActivity path,
         // we want to separate them into a different section.
         super(
@@ -239,7 +236,6 @@ public class ChooserListAdapter extends ResolverListAdapter {
         mPlaceHolderTargetInfo = NotSelectableTargetInfo.newPlaceHolderTargetInfo(context);
         mTargetDataLoader = targetDataLoader;
         mPackageChangeCallback = packageChangeCallback;
-        mUseBadgeTextViewForLabels = featureFlags.bespokeLabelView();
         createPlaceHolders();
         mEventLog = eventLog;
         mShortcutSelectionLogic = new ShortcutSelectionLogic(
@@ -345,12 +341,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
 
     @Override
     View onCreateView(ViewGroup parent) {
-        return mInflater.inflate(
-                mUseBadgeTextViewForLabels
-                        ? R.layout.chooser_grid_item
-                        : R.layout.resolve_grid_item,
-                parent,
-                false);
+        return mInflater.inflate(R.layout.chooser_grid_item, parent, false);
     }
 
     @Override
@@ -448,9 +439,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
         holder.reset();
         holder.itemView.setBackground(holder.defaultItemViewBackground);
 
-        if (mUseBadgeTextViewForLabels) {
-            ((BadgeTextView) holder.text).setBadgeDrawable(null);
-        }
+        ((BadgeTextView) holder.text).setBadgeDrawable(null);
         holder.text.setBackground(null);
         holder.text.setPaddingRelative(0, 0, 0, 0);
     }
@@ -464,12 +453,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
     }
 
     private void bindGroupIndicator(ViewHolder holder, Drawable indicator) {
-        if (mUseBadgeTextViewForLabels) {
-            ((BadgeTextView) holder.text).setBadgeDrawable(indicator);
-        } else {
-            holder.text.setPaddingRelative(0, 0, /*end = */indicator.getIntrinsicWidth(), 0);
-            holder.text.setBackground(indicator);
-        }
+        ((BadgeTextView) holder.text).setBadgeDrawable(indicator);
     }
 
     private void bindPinnedIndicator(ViewHolder holder, Drawable indicator) {
diff --git a/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java
index 8a8fe355..930c84f0 100644
--- a/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java
@@ -75,8 +75,7 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
                 maxTargetsPerRow,
                 userHandle,
                 mTargetDataLoader,
-                null,
-                mFeatureFlags);
+                null);
     }
 
     @Override
diff --git a/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt b/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt
index df0c5e5e..a0f733ab 100644
--- a/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt
+++ b/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt
@@ -66,8 +66,6 @@ class ChooserListAdapterDataTest {
     private val immediateExecutor = TestExecutor(immediate = true)
     private val referrerFillInIntent =
         Intent().putExtra(Intent.EXTRA_REFERRER, "org.referrer.package")
-    private val featureFlags =
-        FakeFeatureFlagsImpl().apply { setFlag(Flags.FLAG_BESPOKE_LABEL_VIEW, false) }
 
     @Test
     fun test_twoTargetsWithNonOverlappingInitialIntent_threeTargetsInResolverAdapter() {
@@ -119,7 +117,6 @@ class ChooserListAdapterDataTest {
                 null,
                 backgroundExecutor,
                 immediateExecutor,
-                featureFlags,
             )
         val doPostProcessing = true
 
@@ -183,7 +180,6 @@ class ChooserListAdapterDataTest {
                 null,
                 backgroundExecutor,
                 immediateExecutor,
-                featureFlags,
             )
         val doPostProcessing = true
 
diff --git a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
index bad3b18c..cdc84ba8 100644
--- a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
+++ b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
@@ -61,7 +61,6 @@ class ChooserListAdapterTest {
     private val mEventLog = mock<EventLogImpl>()
     private val mTargetDataLoader = mock<TargetDataLoader>()
     private val mPackageChangeCallback = mock<ChooserListAdapter.PackageChangeCallback>()
-    private val featureFlags = FeatureFlagsImpl()
 
     private val testSubject by lazy {
         ChooserListAdapter(
@@ -81,7 +80,6 @@ class ChooserListAdapterTest {
             null,
             mTargetDataLoader,
             mPackageChangeCallback,
-            featureFlags,
         )
     }
 
@@ -222,15 +220,10 @@ class ChooserListAdapterTest {
 
     private fun createView(): View {
         val view = FrameLayout(context)
-        if (featureFlags.bespokeLabelView()) {
-                BadgeTextView(context)
-            } else {
-                TextView(context)
-            }
-            .apply {
-                id = R.id.text1
-                view.addView(this)
-            }
+        BadgeTextView(context).apply {
+            id = R.id.text1
+            view.addView(this)
+        }
         TextView(context).apply {
             id = R.id.text2
             view.addView(this)