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

Commit b3a59bb1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8994498 from 12377854 to tm-qpr1-release

Change-Id: I827b4f8d401e14fb9381c4c6b0cd87dcf00fbb07
parents ef013a19 12377854
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,17 @@
        android:layout_toStartOf="@+id/dragHandle"
        android:layout_below="@id/label"/>

    <TextView
        android:id="@+id/default_locale"
        style="@style/LanguageCheckboxAndLabel"
        android:layout_marginTop="-28dp"
        android:paddingStart="56dp"
        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
        android:textColor="?android:textColorSecondary"
        android:text="@string/desc_current_default_language"
        android:layout_toStartOf="@+id/dragHandle"
        android:layout_below="@id/label"/>

    <ImageView
        android:id="@+id/dragHandle"
        android:layout_width="wrap_content"
+21 −3
Original line number Diff line number Diff line
@@ -489,6 +489,12 @@
    <!-- Title for the locale picker activity. [CHAR LIMIT=30]-->
    <string name="language_picker_title">Languages</string>
    <!-- Title for category of the locale picker . [CHAR LIMIT=50]-->
    <string name="language_picker_category_title">Preferred language order</string>
    <!-- Description for indication of current system default language. [CHAR LIMIT=50]-->
    <string name="desc_current_default_language">System language</string>
    <!-- Menu item in the locale menu. Will remove the selected locales. [CHAR LIMIT=30] -->
    <string name="locale_remove_menu">Remove</string>
@@ -502,13 +508,13 @@
    <string name="locale_picker_category_title">Preferred Language</string>
    <!-- Title for the Apps' locale menu entry [CHAR LIMIT=50]-->
    <string name="app_locales_picker_menu_title">App Languages</string>
    <string name="app_locales_picker_menu_title">App languages</string>
    <!-- Summary for the app's locale picker activity. [CHAR LIMIT=50]-->
    <string name="app_locale_picker_summary">Set the language for each app</string>
    <!-- Title for the App's locale picker activity. [CHAR LIMIT=50]-->
    <string name="app_locale_picker_title">App Language</string>
    <string name="app_locale_picker_title">App language</string>
    <!-- Category for the suggested app's locales. [CHAR LIMIT=50]-->
    <string name="suggested_app_locales_title">Suggested languages</string>
@@ -531,6 +537,18 @@
    <!-- Description for introduction of the locale selection supported of app list [CHAR LIMIT=NONE]-->
    <string name="desc_app_locale_selection_supported">Only apps that support language selection are shown here.</string>
    <!-- Description for the introduction to language picker activity. [CHAR LIMIT=NONE]-->
    <string name="desc_introduction_of_language_picker">Your system, apps, and websites use the first supported language from your preferred languages.</string>
    <!-- Description for the notice of language picker. [CHAR LIMIT=NONE]-->
    <string name="desc_notice_of_language_picker">To select a language for each app, go to app language settings.</string>
    <!-- Title for locale helper page [CHAR LIMIT=NONE] -->
    <string name="desc_locale_helper_footer_general">Learn more about languages</string>
    <!-- Link for Locale helper page. [CHAR LIMIT=NONE]-->
    <string name="link_locale_picker_footer_learn_more" translatable="false">https://support.google.com/android?p=per_language_app_settings</string>
    <!-- The title of the confirmation dialog shown when the user selects one / several languages and tries to remove them [CHAR LIMIT=60] -->
    <plurals name="dlg_remove_locales_title">
        <item quantity="one">Remove selected language?</item>
@@ -546,7 +564,7 @@
    <string name="dlg_remove_locales_error_message">Keep at least one preferred language</string>
    <!-- This text shows in the language picker when the system is not translated into that languages [CHAR LIMIT=80] -->
    <string name="locale_not_translated">May not be available in some apps</string>
    <string name="locale_not_translated">Not available as system language</string>
    <!-- Label for an accessibility action that moves a language up in the ordered language list [CHAR LIMIT=20] -->
    <string name="action_drag_label_move_up">Move up</string>
+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@
            android:title="@string/notification_pulse_title"
            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>

        <SwitchPreference
        <com.android.settingslib.PrimarySwitchPreference
            android:key="notification_assistant"
            android:order="23"
            android:title="@string/notification_assistant_title"

res/xml/languages.xml

0 → 100644
+42 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2022 The Android Open Source Project

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  -->

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:title="@string/language_settings">

    <com.android.settingslib.widget.TopIntroPreference
        android:title="@string/desc_introduction_of_language_picker"
        android:persistent="false"
        android:selectable="false"/>

    <PreferenceCategory
        android:title="@string/language_picker_category_title">
        <com.android.settingslib.widget.LayoutPreference
            android:key="languages_picker"
            android:layout="@layout/locale_order_list" />
    </PreferenceCategory>

    <com.android.settingslib.widget.FooterPreference
        android:key="footer_languages_picker"
        android:title="@string/desc_notice_of_language_picker"
        android:persistent="false"
        android:selectable="false"
        settings:controller="com.android.settings.localepicker.LocaleHelperPreferenceController"/>

</PreferenceScreen>
+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ public class AppLocaleUtil {
     */
    public static boolean isAppLocaleSupported(Context context, String packageName) {
        LocaleList localeList = getPackageLocales(context, packageName);
        if (localeList != null && localeList.size() > 0) {
            return true;
        if (localeList != null) {
            return localeList.size() > 0;
        }

        if (FeatureFlagUtils.isEnabled(
Loading