Merge "Sharesheet - make loading placeholders unclickable" into qt-dev (f3c58fd2) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -2188,7 +2188,7 @@ public class ChooserActivity extends ResolverActivity {
		protected void onBindView(View view, TargetInfo info) {
		super.onBindView(view, info);

		// If target is loading, show a special placeholder shape in the label
		// If target is loading, show a special placeholder shape in the label, make unclickable
		final ViewHolder holder = (ViewHolder) view.getTag();
		if (info instanceof PlaceHolderTargetInfo) {
		final int maxWidth = getResources().getDimensionPixelSize(
		@@ -2196,9 +2196,12 @@ public class ChooserActivity extends ResolverActivity {
		holder.text.setMaxWidth(maxWidth);
		holder.text.setBackground(getResources().getDrawable(
		R.drawable.chooser_direct_share_label_placeholder, getTheme()));
		// Prevent rippling by removing background containing ripple
		holder.itemView.setBackground(null);
		} else {
		holder.text.setMaxWidth(Integer.MAX_VALUE);
		holder.text.setBackground(null);
		holder.itemView.setBackground(holder.defaultItemViewBackground);
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -2061,11 +2061,16 @@ public class ResolverActivity extends Activity {
		}

		static class ViewHolder {
		public View itemView;
		public Drawable defaultItemViewBackground;

		public TextView text;
		public TextView text2;
		public ImageView icon;

		public ViewHolder(View view) {
		itemView = view;
		defaultItemViewBackground = view.getBackground();
		text = (TextView) view.findViewById(com.android.internal.R.id.text1);
		text2 = (TextView) view.findViewById(com.android.internal.R.id.text2);
		icon = (ImageView) view.findViewById(R.id.icon);