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

Commit 2d2b57bc authored by Calvin Pan's avatar Calvin Pan Committed by Android (Google) Code Review
Browse files

Merge "Using different strings for language/region picker"

parents 7ef4a664 817ad353

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

+5 −1
Original line number Diff line number Diff line
@@ -217,7 +217,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
@@ -5422,8 +5422,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 suggested languages determined by the default region [CHAR LIMIT=30] -->

    <string name="language_picker_section_suggested_bilingual">Suggested languages</string>

core/res/res/values/symbols.xml

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

  <java-symbol type="string" name="region_picker_section_suggested_bilingual" />

  <java-symbol type="string" name="language_selection_title" />