diff options
| author | 2022-08-24 10:12:13 +0000 | |
|---|---|---|
| committer | 2022-08-24 10:12:13 +0000 | |
| commit | 6198fd99ab1cbadbd7ed3b5173af39e98a2ca346 (patch) | |
| tree | 9915dff73102b8aecc32affc77df5b1c81551434 | |
| parent | 01313d12677abde66508b88b7f4978de51725a01 (diff) | |
| parent | ee666baeaca167f22faf05c224dc2304db3f6f8f (diff) | |
Merge "Using different strings for language/region picker" into tm-qpr-dev am: ee666baeac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19706830
Change-Id: Ie3d0b0864bd1f8bf29e5ae220f1c1b903ac58b34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 d0338892c43d..a67be07dda75 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5417,8 +5417,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 248e4e652688..46fbcd166f5d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3124,6 +3124,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" /> |