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

Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2

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

Change-Id: I64d03130973664aed40579ef3c669e5c1906b594
This commit is contained in:
YUKAI HUNG
2021-05-11 04:04:08 +00:00
committed by Automerger Merge Worker
parent 3ea3c99e16 7a678f29b2
commit b8ce43a2ef
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -8051,6 +8051,9 @@
<string name="keywords_display_cast_screen">project, cast, Screen mirroring, Screen sharing, mirroring, share screen, screen casting</string>
<string name="keywords_storage">space, disk, hard drive, device usage</string>
<string name="keywords_battery">power usage, charge</string>
<string name="keywords_battery_usage">view battery usage, battery usage, power usage</string>
<string name="keywords_battery_saver">battery saver, power saver, saver</string>
<string name="keywords_battery_adaptive_preferences">adaptive preferences, adaptive battery</string>
<string name="keywords_spell_checker">spelling, dictionary, spellcheck, auto-correct</string>
<string name="keywords_voice_input">recognizer, input, speech, speak, language, hands-free, hand free, recognition, offensive, word, audio, history, bluetooth headset</string>
<string name="keywords_text_to_speech_output">rate, language, default, speak, speaking, tts, accessibility, screen reader, blind</string>

3
res/xml/battery_saver_settings.xml
View File

@@ -17,7 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/battery_saver">
android:title="@string/battery_saver"
settings:keywords="@string/keywords_battery_saver">
<com.android.settingslib.widget.MainSwitchPreference
android:order="-100"

2
res/xml/power_usage_advanced.xml
View File

@@ -19,7 +19,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="power_usage_advanced_screen"
android:title="@string/advanced_battery_title"
settings:keywords="@string/keywords_battery">
settings:keywords="@string/keywords_battery_usage">
<com.android.settings.fuelgauge.BatteryHistoryPreference
android:key="battery_graph"/>

6
res/xml/power_usage_summary.xml
View File

@@ -42,19 +42,21 @@
android:fragment="com.android.settings.fuelgauge.PowerUsageAdvanced"
android:key="battery_usage_summary"
android:title="@string/advanced_battery_preference_title"
settings:searchable="false" />
settings:keywords="@string/keywords_battery_usage" />
<Preference
android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
android:key="battery_saver_summary"
android:title="@string/battery_saver"
settings:keywords="@string/keywords_battery_saver"
settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
<Preference
android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
android:key="smart_battery_manager"
android:title="@string/smart_battery_manager_title"
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" />
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
settings:keywords="@string/keywords_battery_adaptive_preferences" />
<SwitchPreference
android:key="battery_percentage"

2
res/xml/smart_battery_detail.xml
View File

@@ -20,7 +20,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="smart_battery_detail"
android:title="@string/smart_battery_manager_title"
settings:searchable="false">
settings:keywords="@string/keywords_battery_adaptive_preferences">
<com.android.settings.widget.VideoPreference
android:key="auto_awesome_battery"