Merge "Fix shortcuts loading state" into main

2 files changed, 2 insertions, 10 deletions

diff --git a/java/src/com/android/intentresolver/ChooserListAdapter.java b/java/src/com/android/intentresolver/ChooserListAdapter.java
index 35258317..9a15c919 100644
--- a/java/src/com/android/intentresolver/ChooserListAdapter.java
+++ b/java/src/com/android/intentresolver/ChooserListAdapter.java
@@ -375,13 +375,8 @@ public class ChooserListAdapter extends ResolverListAdapter {
             }
         }
 
-        // If target is loading, show a special placeholder shape in the label, make unclickable
         if (info.isPlaceHolderTargetInfo()) {
-            int maxTextWidth = mContext.getResources().getDimensionPixelSize(
-                    R.dimen.chooser_direct_share_label_placeholder_max_width);
-            Drawable placeholderDrawable = mContext.getResources().getDrawable(
-                    R.drawable.chooser_direct_share_label_placeholder, mContext.getTheme());
-            holder.bindPlaceholderDrawable(maxTextWidth, placeholderDrawable);
+            holder.bindPlaceholder();
         }
 
         if (info.isMultiDisplayResolveInfo()) {
diff --git a/java/src/com/android/intentresolver/ResolverListAdapter.java b/java/src/com/android/intentresolver/ResolverListAdapter.java
index ab669f92..6c17df1d 100644
--- a/java/src/com/android/intentresolver/ResolverListAdapter.java
+++ b/java/src/com/android/intentresolver/ResolverListAdapter.java
@@ -994,10 +994,7 @@ public class ResolverListAdapter extends BaseAdapter {
             }
         }
 
-        public void bindPlaceholderDrawable(int maxTextWidth, Drawable drawable) {
-            text.setMaxWidth(maxTextWidth);
-            text.setBackground(drawable);
-            // Prevent rippling by removing background containing ripple
+        public void bindPlaceholder() {
             itemView.setBackground(null);
         }