PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "regional_preference_metrics" into udc-dev

Browse Source 
* 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
This commit is contained in:
Zoey Chen
2023-04-25 02:59:27 +00:00
committed by Android (Google) Code Review
parent ef196f7f3e 10fa1b8aec
commit 1d74998647
20 changed files with 781 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/xml/regional_preference_main_page.xml
View File

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

32
res/xml/regional_preferences_first_day_of_week.xml Normal file
View File

@@ -0,0 +1,32 @@
<?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>

16
res/xml/regional_preference_content_page.xml → res/xml/regional_preferences_temperature.xml
View File

@@ -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" />
</PreferenceScreen>
<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>