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

Commit a0ace718 authored by Mihai Niță's avatar Mihai Niță Committed by Android (Google) Code Review
Browse files

Merge "Changed the header of the region selection list to "All regions"" into nyc-mr1-dev

parents a630b2d6 543e45ba

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

+5 −1
Original line number Diff line number Diff line
@@ -144,9 +144,13 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
                TextView textView = (TextView) convertView;

                if (itemType == TYPE_HEADER_SUGGESTED) {

                    textView.setText(R.string.language_picker_section_suggested);

                } else {

                    if (mCountryMode) {

                        textView.setText(R.string.region_picker_section_all);

                    } else {

                        textView.setText(R.string.language_picker_section_all);

                    }

                }

                textView.setTextLocale(Locale.getDefault());

                break;

            default:

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -4359,6 +4359,9 @@ 
    <string name="language_picker_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.

    Warning: this is a more 'neutral' term for 'country', not for the sub-divisions of a country. [CHAR LIMIT=30] -->

    <string name="region_picker_section_all">All regions</string>



    <!-- Menu item in the locale menu  [CHAR LIMIT=30] -->

    <string name="locale_search_menu">Search</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2508,6 +2508,7 @@ 
  <java-symbol type="menu" name="language_selection_list" />

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

  <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_selection_title" />

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