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

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

Merge changes from topic "regional_preference_metrics" into udc-dev 

* changes:
  [Regional Pref] Remove Calendar controller and related Fragement
  [Regional Pref] 1. Add metrics for user changes the First day of week 2. Refactor to Settings design
  [Regional Pref] 1. Add metrics for user changes the Temperature unit 2. Refactor to Settings design
parents ef196f7f 10fa1b8a

res/values/arrays.xml

+0 −14
Original line number Diff line number Diff line
@@ -1389,20 +1389,6 @@ 
        <item>sat</item>

    </string-array>



    <!-- A list for all supported calendar types. [DO NOT TRANSLATE] -->

    <string-array name="calendar_type">

        <item>default</item>

        <item>chinese</item>

        <item>dangi</item>

        <item>hebrew</item>

        <item>indian</item>

        <item>islamic</item>

        <item>islamic-rgsa</item>

        <item>islamic-tbla</item>

        <item>islamic-umalqura</item>

        <item>persian</item>

    </string-array>



    <!-- Screen flash notification color when activating -->

    <array name="screen_flash_notification_preset_opacity_colors">

        <item>@color/screen_flash_preset_opacity_color_01</item>

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -401,8 +401,6 @@ 
    <string name="regional_preferences_option_page_sub_title">Apps will use your regional preferences where possible.</string>

    <!-- The title of menu entry of Temperature unit preference. [CHAR LIMIT=50] -->

    <string name="temperature_preferences_title">Temperature</string>

    <!-- The title of the  menu entry of Calendar type preference. [CHAR LIMIT=50]  -->

    <string name="calendar_preferences_title">Calendar</string>

    <!-- The title of the  menu entry of First day of week preference. [CHAR LIMIT=50]  -->

    <string name="first_day_of_week_preferences_title">First day of week</string>

    <!-- The title of the menu entry of Numbers system preference. [CHAR LIMIT=50]  -->

res/xml/regional_preference_main_page.xml

+2 −13
Original line number Diff line number Diff line
@@ -27,29 +27,18 @@ 
        android:title="@string/temperature_preferences_title"

        android:summary="@string/default_string_of_regional_preference"

        settings:controller="com.android.settings.regionalpreferences.TemperatureUnitController"

        settings:fragment="com.android.settings.regionalpreferences.RegionalPreferencesFragment">

        settings:fragment="com.android.settings.regionalpreferences.TemperatureUnitFragment">

        <extra

            android:name="arg_key_regional_preference"

            android:value="mu" />

    </Preference>



    <Preference

        android:key="key_calendar_type"

        android:title="@string/calendar_preferences_title"

        android:summary="@string/default_string_of_regional_preference"

        settings:controller="com.android.settings.regionalpreferences.CalendarTypeController"

        settings:fragment="com.android.settings.regionalpreferences.RegionalPreferencesFragment">

        <extra

            android:name="arg_key_regional_preference"

            android:value="ca" />

    </Preference>



    <Preference

        android:key="key_first_day_of_week"

        android:title="@string/first_day_of_week_preferences_title"

        android:summary="@string/default_string_of_regional_preference"

        settings:controller="com.android.settings.regionalpreferences.FirstDayOfWeekController"

        settings:fragment="com.android.settings.regionalpreferences.RegionalPreferencesFragment">

        settings:fragment="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment">

        <extra

            android:name="arg_key_regional_preference"

            android:value="fw" />

res/xml/regional_preferences_first_day_of_week.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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/first_day_of_week_preferences_title">



    <com.android.settingslib.widget.TopIntroPreference

        android:title="@string/regional_preferences_option_page_sub_title"

        android:persistent="false" />



    <PreferenceCategory

        android:key="first_day_of_week_item_category"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:controller="com.android.settings.regionalpreferences.FirstDayOfWeekItemCategoryController"/>



</PreferenceScreen>

res/xml/regional_preference_content_page.xml→res/xml/regional_preferences_temperature.xml

+13 −3
Original line number Diff line number Diff line
@@ -13,10 +13,20 @@ 
     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"

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

    android:title="@string/temperature_preferences_title">



    <com.android.settingslib.widget.TopIntroPreference

        android:key="key_option_page_sub_title"

        android:title="@string/regional_preferences_option_page_sub_title"

        android:persistent="false" />



    <PreferenceCategory

        android:key="temperature_unit_category"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:controller="com.android.settings.regionalpreferences.TemperatureUnitCategoryController"/>



</PreferenceScreen>