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

Commit f7b2f0a1 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Add pref key for metrics" into main

parents 9233fe7b 21a54d03

res/xml/language_settings.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/languages_settings">

    android:title="@string/languages_settings"

    android:key="languages_settings">

    <PreferenceCategory

        android:key="languages_category"

        android:title="@string/locale_picker_category_title">

res/xml/languages.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/language_picker_title">

    android:title="@string/language_picker_title"

    android:key="system_languages">



    <com.android.settingslib.widget.TopIntroPreference

        android:title="@string/desc_introduction_of_language_picker"

res/xml/regional_preference_main_page.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/regional_preferences_title">

    android:title="@string/regional_preferences_title"

    android:key="regional_preferences">



    <com.android.settingslib.widget.TopIntroPreference

        android:title="@string/regional_preferences_main_page_sub_title"

res/xml/regional_preference_numbering_system_page.xml

+3 −1
Original line number Diff line number Diff line
@@ -13,4 +13,6 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" />
 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:key="regional_preference_numbering_system"/>

res/xml/regional_preferences_first_day_of_week.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/first_day_of_week_preferences_title">

    android:title="@string/first_day_of_week_preferences_title"

    android:key="regional_preference_first_day_of_week">



    <com.android.settingslib.widget.TopIntroPreference

        android:title="@string/regional_preferences_option_page_sub_title"