Merge "Merge "Resolver/Chooser - Fix reuse of textview" into rvc-dev am:... (002eb79d) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -689,17 +689,17 @@ public class ResolverListAdapter extends BaseAdapter {
		}

		public void bindLabel(CharSequence label, CharSequence subLabel, boolean showSubLabel) {
		if (!TextUtils.equals(text.getText(), label)) {
		text.setText(label);
		}

		if (TextUtils.equals(label, subLabel)) {
		subLabel = "";
		subLabel = null;
		}

		if (showSubLabel \|\| !TextUtils.equals(text2.getText(), subLabel)) {
		text2.setVisibility(View.VISIBLE);
		text2.setText(subLabel);
		if (showSubLabel \|\| subLabel != null) {
		text2.setVisibility(View.VISIBLE);
		} else {
		text2.setVisibility(View.GONE);
		}

		itemView.setContentDescription(null);