PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: change the TTS text to use the current locale" into nyc-dev

Browse Source 
am: b1cdea67a5

* commit 'b1cdea67a5e2dda1ece17df4b98f20e7eeaa8a46':
  Settings: change the TTS text to use the current locale

Change-Id: I1f7098ef1541f9ce89b2fdf2e701cd87166ba777
This commit is contained in:
Mihai Nita
2016-04-21 20:03:14 +00:00
committed by android-build-merger
parent 33c6972453 b1cdea67a5
commit 093817bd23
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
View File

@@ -152,8 +152,9 @@ class LocaleDragAndDropAdapter
public void onBindViewHolder(final CustomViewHolder holder, int i) { public void onBindViewHolder(final CustomViewHolder holder, int i) {
final LocaleStore.LocaleInfo feedItem = mFeedItemList.get(i); final LocaleStore.LocaleInfo feedItem = mFeedItemList.get(i);
final LocaleDragCell dragCell = holder.getLocaleDragCell(); final LocaleDragCell dragCell = holder.getLocaleDragCell();
String label = feedItem.getFullNameNative(); final String label = feedItem.getFullNameNative();
dragCell.setLabel(label); final String description = feedItem.getFullNameInUiLanguage();
dragCell.setLabelAndDescription(label, description);
dragCell.setLocalized(feedItem.isTranslated()); dragCell.setLocalized(feedItem.isTranslated());
dragCell.setMiniLabel(mNumberFormatter.format(i + 1)); dragCell.setMiniLabel(mNumberFormatter.format(i + 1));
dragCell.setShowCheckbox(mRemoveMode); dragCell.setShowCheckbox(mRemoveMode);
@@ -166,7 +167,7 @@ class LocaleDragAndDropAdapter
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
LocaleStore.LocaleInfo feedItem = LocaleStore.LocaleInfo feedItem =
(LocaleStore.LocaleInfo) holder.getLocaleDragCell().getTag(); (LocaleStore.LocaleInfo) dragCell.getTag();
feedItem.setChecked(isChecked); feedItem.setChecked(isChecked);
} }
}); });

4
src/com/android/settings/localepicker/LocaleDragCell.java
View File

@@ -87,9 +87,11 @@ class LocaleDragCell extends RelativeLayout {
invalidate(); invalidate();
} }
public void setLabel(String labelText) { public void setLabelAndDescription(String labelText, String description) {
mLabel.setText(labelText); mLabel.setText(labelText);
mCheckbox.setText(labelText); mCheckbox.setText(labelText);
mLabel.setContentDescription(description);
mCheckbox.setContentDescription(description);
invalidate(); invalidate();
} }