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

Commit b6e81a40 authored by Mihai Nita's avatar Mihai Nita Committed by android-build-merger
Browse files

Changed the header of the region selection list to "All regions" am: 543e45ba 

am: c3b11eb0

Change-Id: Id5a4ccda29952ae68f1d73c1c063547cc8c827c3
parents c49140f8 c3b11eb0

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
@@ -4365,6 +4365,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
@@ -2513,6 +2513,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" />