diff options
| author | 2022-08-24 09:30:22 +0000 | |
|---|---|---|
| committer | 2022-08-24 09:30:22 +0000 | |
| commit | ee666baeaca167f22faf05c224dc2304db3f6f8f (patch) | |
| tree | 97ba765de1b67aeec228333890bc4b9191946213 | |
| parent | 78b2b5567cd50d46d135e35ddbec4b0ce6117c4c (diff) | |
| parent | 80e0a51b68e9ac9ba569605a2c6a2f1856a61e2e (diff) | |
Merge "Using different strings for language/region picker" into tm-qpr-dev
| -rw-r--r-- | core/java/com/android/internal/app/SuggestedLocaleAdapter.java | 6 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java index ff188dc6f2b9..1be1247b7cc0 100644 --- a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java +++ b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java @@ -207,7 +207,11 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { case TYPE_HEADER_ALL_OTHERS: TextView textView = (TextView) itemView; if (itemType == TYPE_HEADER_SUGGESTED) { - setTextTo(textView, R.string.language_picker_section_suggested); + if (mCountryMode) { + setTextTo(textView, R.string.language_picker_regions_section_suggested); + } else { + setTextTo(textView, R.string.language_picker_section_suggested); + } } else { if (mCountryMode) { setTextTo(textView, R.string.region_picker_section_all); diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 17f0fd0b7d02..ec8314702658 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5429,8 +5429,10 @@ <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=25] --> <string name="search_language_hint">Type language name</string> - <!-- List section subheader for the language picker, containing a list of suggested languages determined by the default region [CHAR LIMIT=30] --> + <!-- List section subheader for the language picker, containing a list of suggested languages [CHAR LIMIT=30] --> <string name="language_picker_section_suggested">Suggested</string> + <!-- "List section subheader for the language picker, containing a list of suggested regions available for that language [CHAR LIMIT=30] --> + <string name="language_picker_regions_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. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c098aca7b377..145d0699cac8 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3135,6 +3135,7 @@ <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_regions_section_suggested" /> <java-symbol type="string" name="language_selection_title" /> <java-symbol type="string" name="search_language_hint" /> |