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 am: 1d74998647 am: b37a320ed8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: I8c2c90ccb81c1cc731a899d085b7601c480ef869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zoey Chen
2023-04-25 04:51:21 +00:00
committed by Automerger Merge Worker
parent b687c3a6cd b37a320ed8
commit 29efe8eaf7
20 changed files with 781 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/arrays.xml
View File

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

2
res/values/strings.xml
View File

@@ -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] -->