Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed the header of the region selection list to "All regions"" into nyc-mr1-dev

Browse Source
This commit is contained in:
Mihai Niță
2016-09-08 20:48:11 +00:00
committed by Android (Google) Code Review
parent a630b2d667 543e45babe
commit a0ace71899
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/SuggestedLocaleAdapter.java
View File

@@ -144,9 +144,13 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
TextView textView = (TextView) convertView; TextView textView = (TextView) convertView;
if (itemType == TYPE_HEADER_SUGGESTED) { if (itemType == TYPE_HEADER_SUGGESTED) {
textView.setText(R.string.language_picker_section_suggested); textView.setText(R.string.language_picker_section_suggested);
} else {
if (mCountryMode) {
textView.setText(R.string.region_picker_section_all);
} else { } else {
textView.setText(R.string.language_picker_section_all); textView.setText(R.string.language_picker_section_all);
} }
}
textView.setTextLocale(Locale.getDefault()); textView.setTextLocale(Locale.getDefault());
break; break;
default: default:

3
core/res/res/values/strings.xml
View File

@@ -4359,6 +4359,9 @@
<string name="language_picker_section_suggested">Suggested</string> <string name="language_picker_section_suggested">Suggested</string>
<!-- List section subheader for the language picker, containing a list of all languages available [CHAR LIMIT=30] --> <!-- List section subheader for the language picker, containing a list of all languages available [CHAR LIMIT=30] -->
<string name="language_picker_section_all">All languages</string> <string name="language_picker_section_all">All languages</string>
<!-- List section subheader for the region picker, containing a list of all regions supported for the selected language.
Warning: this is a more 'neutral' term for 'country', not for the sub-divisions of a country. [CHAR LIMIT=30] -->
<string name="region_picker_section_all">All regions</string>
<!-- Menu item in the locale menu [CHAR LIMIT=30] --> <!-- Menu item in the locale menu [CHAR LIMIT=30] -->
<string name="locale_search_menu">Search</string> <string name="locale_search_menu">Search</string>

1
core/res/res/values/symbols.xml
View File

@@ -2508,6 +2508,7 @@
<java-symbol type="menu" name="language_selection_list" /> <java-symbol type="menu" name="language_selection_list" />
<java-symbol type="string" name="country_selection_title" /> <java-symbol type="string" name="country_selection_title" />
<java-symbol type="string" name="language_picker_section_all" /> <java-symbol type="string" name="language_picker_section_all" />
<java-symbol type="string" name="region_picker_section_all" />
<java-symbol type="string" name="language_picker_section_suggested" /> <java-symbol type="string" name="language_picker_section_suggested" />
<java-symbol type="string" name="language_selection_title" /> <java-symbol type="string" name="language_selection_title" />
<java-symbol type="string" name="search_language_hint" /> <java-symbol type="string" name="search_language_hint" />