Merge "Set delete button description for editor view without type." (2b375033) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/editor/LabeledEditorView.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -300,8 +300,8 @@ public abstract class LabeledEditorView extends LinearLayout implements Editor,
		mEntry.getAsString(mType.customColumn),
		getContext().getString(mKind.titleRes)));
		} else {
		mLabel.setSelection(mEditTypeAdapter.getPosition(mType));
		if (mType != null) {
		mLabel.setSelection(mEditTypeAdapter.getPosition(mType));
		mDeleteContainer.setContentDescription(
		getContext().getString(R.string.editor_delete_view_description,
		getContext().getString(mType.labelRes),
		@@ -408,11 +408,9 @@ public abstract class LabeledEditorView extends LinearLayout implements Editor,
		mLabel.setEnabled(!readOnly && isEnabled());
		mLabel.setContentDescription(getContext().getResources().getString(mKind.titleRes));

		if (hasTypes) {
		mType = RawContactModifier.getCurrentType(entry, kind);
		rebuildLabel();
		}
		}

		public ValuesDelta getValues() {
		return mEntry;