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

Changed the header of the region selection list to "All regions" am: 543e45babe

Browse Source 
am: c3b11eb043

Change-Id: Id5a4ccda29952ae68f1d73c1c063547cc8c827c3
This commit is contained in:
Mihai Nita
2016-09-08 21:01:02 +00:00
committed by android-build-merger
parent c49140f80c c3b11eb043
commit b6e81a40cd
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,11 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
if (itemType == TYPE_HEADER_SUGGESTED) {
textView.setText(R.string.language_picker_section_suggested);
} else {
textView.setText(R.string.language_picker_section_all);
if (mCountryMode) {
textView.setText(R.string.region_picker_section_all);
} else {
textView.setText(R.string.language_picker_section_all);
}
}
textView.setTextLocale(Locale.getDefault());
break;

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

@@ -4365,6 +4365,9 @@
<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] -->
<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] -->
<string name="locale_search_menu">Search</string>

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

@@ -2513,6 +2513,7 @@
<java-symbol type="menu" name="language_selection_list" />
<java-symbol type="string" name="country_selection_title" />
<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_selection_title" />
<java-symbol type="string" name="search_language_hint" />