diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index 2ce4e72f3d7..2d22b06a9cf 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -152,8 +152,9 @@ class LocaleDragAndDropAdapter public void onBindViewHolder(final CustomViewHolder holder, int i) { final LocaleStore.LocaleInfo feedItem = mFeedItemList.get(i); final LocaleDragCell dragCell = holder.getLocaleDragCell(); - String label = feedItem.getFullNameNative(); - dragCell.setLabel(label); + final String label = feedItem.getFullNameNative(); + final String description = feedItem.getFullNameInUiLanguage(); + dragCell.setLabelAndDescription(label, description); dragCell.setLocalized(feedItem.isTranslated()); dragCell.setMiniLabel(mNumberFormatter.format(i + 1)); dragCell.setShowCheckbox(mRemoveMode); @@ -166,7 +167,7 @@ class LocaleDragAndDropAdapter @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { LocaleStore.LocaleInfo feedItem = - (LocaleStore.LocaleInfo) holder.getLocaleDragCell().getTag(); + (LocaleStore.LocaleInfo) dragCell.getTag(); feedItem.setChecked(isChecked); } }); diff --git a/src/com/android/settings/localepicker/LocaleDragCell.java b/src/com/android/settings/localepicker/LocaleDragCell.java index b3ecfad095d..ea86189b018 100644 --- a/src/com/android/settings/localepicker/LocaleDragCell.java +++ b/src/com/android/settings/localepicker/LocaleDragCell.java @@ -87,9 +87,11 @@ class LocaleDragCell extends RelativeLayout { invalidate(); } - public void setLabel(String labelText) { + public void setLabelAndDescription(String labelText, String description) { mLabel.setText(labelText); mCheckbox.setText(labelText); + mLabel.setContentDescription(description); + mCheckbox.setContentDescription(description); invalidate(); }