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

Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev am: d06a66be9f

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

Change-Id: I0389695bfb0210181963a6c6507524b00f6f9884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xiaowen Lei
2022-04-22 01:45:48 +00:00
committed by Automerger Merge Worker
parent 3d592e4b7a d06a66be9f
commit 54b996c88b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3193,6 +3193,8 @@
<string name="style_suggestion_summary">Try different styles, wallpapers, and more</string>
<!-- Display settings screen, trigger for screen saver options [CHAR LIMIT=30] -->
<string name="screensaver_settings_title">Screen saver</string>
<!-- List of synonyms used in the settings search bar to find the “Screen saver”. [CHAR LIMIT=NONE] -->
<string name="keywords_screensaver">screensaver</string>
<!-- The title for the toggle which disables/enables screen savers [CHAR_LIMIT=30] -->
<string name="screensaver_settings_toggle_title">Use screen saver</string>
<!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging [CHAR LIMIT=35] -->

3
res/xml/display_settings.xml
View File

@@ -144,7 +144,8 @@
<Preference
android:key="screensaver"
android:title="@string/screensaver_settings_title"
android:fragment="com.android.settings.dream.DreamSettings"/>
android:fragment="com.android.settings.dream.DreamSettings"
settings:keywords="@string/keywords_screensaver"/>
<SwitchPreference
android:key="camera_gesture"

4
res/xml/dream_fragment_overview.xml
View File

@@ -17,7 +17,9 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/screensaver_settings_title">
android:key="screensaver_settings_screen"
android:title="@string/screensaver_settings_title"
settings:keywords="@string/keywords_screensaver">
<com.android.settingslib.widget.MainSwitchPreference
android:key="dream_main_settings_switch"