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

Merge "Using different strings for language/region picker" into tm-qpr-dev am: ee666baeac

Browse Source 
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>
This commit is contained in:
Calvin Pan
2022-08-24 10:12:13 +00:00
committed by Automerger Merge Worker
parent 01313d1267 ee666baeac
commit 6198fd99ab
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,11 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
case TYPE_HEADER_ALL_OTHERS: case TYPE_HEADER_ALL_OTHERS:
TextView textView = (TextView) itemView; TextView textView = (TextView) itemView;
if (itemType == TYPE_HEADER_SUGGESTED) { 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 { } else {
if (mCountryMode) { if (mCountryMode) {
setTextTo(textView, R.string.region_picker_section_all); setTextTo(textView, R.string.region_picker_section_all);

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

@@ -5417,8 +5417,10 @@
<!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=25] --> <!-- 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> <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> <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] --> <!-- 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. <!-- List section subheader for the region picker, containing a list of all regions supported for the selected language.

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

@@ -3124,6 +3124,7 @@
<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="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_picker_regions_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" />