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

Merge "Update category names in Display page" into sc-dev am: ee01f3dd5b

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

Change-Id: Id4b7697a7bca1d0a2dced4b863945ad62444d140
This commit is contained in:
Yi-Ling Chuang
2021-03-24 09:47:46 +00:00
committed by Automerger Merge Worker
parent c604759053 ee01f3dd5b
commit f740fb189d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -12912,10 +12912,12 @@
<string name="category_name_brightness">Brightness</string> <string name="category_name_brightness">Brightness</string>
<!-- Lock screen category name in Display Settings [CHAR LIMIT=none] --> <!-- Lock screen category name in Display Settings [CHAR LIMIT=none] -->
<string name="category_name_lock_display">Lock Display</string> <string name="category_name_lock_display">Lock Display</string>
<!-- Visibility category name in Display Settings [CHAR LIMIT=none] --> <!-- Appearance category name in Display Settings [CHAR LIMIT=none] -->
<string name="category_name_visibility">Visibility</string> <string name="category_name_appearance">Appearance</string>
<!-- Color category name in Display Settings [CHAR LIMIT=none] --> <!-- Color category name in Display Settings [CHAR LIMIT=none] -->
<string name="category_name_color">Color</string> <string name="category_name_color">Color</string>
<!-- Name of Other display controls category in Display Settings [CHAR LIMIT=none] -->
<string name="category_name_display_controls">Other Display Controls</string>
<!-- Others category name [CHAR LIMIT=none] --> <!-- Others category name [CHAR LIMIT=none] -->
<string name="category_name_others">Others</string> <string name="category_name_others">Others</string>
<!-- General category name [CHAR LIMIT=none] --> <!-- General category name [CHAR LIMIT=none] -->

4
res/xml/display_settings_v2.xml
View File

@@ -59,7 +59,7 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="@string/category_name_visibility"> android:title="@string/category_name_appearance">
<com.android.settings.display.darkmode.DarkModePreference <com.android.settings.display.darkmode.DarkModePreference
android:key="dark_ui_mode" android:key="dark_ui_mode"
@@ -102,7 +102,7 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="@string/category_name_general"> android:title="@string/category_name_display_controls">
<SwitchPreference <SwitchPreference
android:key="auto_rotate" android:key="auto_rotate"