From ec76550c45c13d5f145602370ce321e994906814 Mon Sep 17 00:00:00 2001
From: Andrey Yepin <ayepin@google.com>
Date: Wed, 10 Jul 2024 15:14:34 -0700
Subject: Remove bespoke_label_view

Launched.

Bug: 302188527
Test: presubmits
Flag: EXEMPT removing com.android.intentresolver.bespoke_label_view
Change-Id: Ia3f3b80b6e854f4ecd569936e144815e5ab592d7
---
 .../android/intentresolver/ChooserActivity.java    |  3 +--
 .../android/intentresolver/ChooserListAdapter.java | 30 +++++-----------------
 2 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'java/src')

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) {
-- 
cgit v1.2.3-59-g8ed1b