Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6198fd99 authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19706830



Change-Id: Ie3d0b0864bd1f8bf29e5ae220f1c1b903ac58b34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01313d12 ee666bae

core/java/com/android/internal/app/SuggestedLocaleAdapter.java

+5 −1
Original line number Diff line number Diff line
@@ -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) {

                   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);

core/res/res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -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.

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />