Fix shortcuts loading state

Caused by ag/24642135: legacy code, effectively, did not set background
for the shortcut placeholder labels. Specifically, for a placeholder
TargetInfo with isPlaceholderTargetInfo() returning true, neither
isMultiDisplayResolveInfo() nor isPinned() returned true as well thus
the background drawable set for the label got immediately reset by the
following logic (and ag/24642135 removed this overriding logic).

This change removes the placeholder label background drawable and
related view size limitation.

Fix: 302391707
Test: manual testing -- simulate long shortcut loading (by a code
injection), observe no visual artifacts in the shortcuts row.

Change-Id: I86975407b729b488a0a5c924859bc218abc4444e

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 d1e8c15b..0dd89d87 100644
--- a/java/src/com/android/intentresolver/ResolverListAdapter.java
+++ b/java/src/com/android/intentresolver/ResolverListAdapter.java
@@ -993,10 +993,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);
         }