summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/accessibility_settings.xml13
-rw-r--r--res/xml/bluetooth_device_advanced.xml8
-rw-r--r--res/xml/development_prefs.xml21
-rw-r--r--res/xml/display_settings.xml2
-rw-r--r--res/xml/language_settings.xml2
-rw-r--r--res/xml/location_settings.xml6
-rw-r--r--res/xml/manage_accounts_settings.xml6
-rw-r--r--res/xml/privacy_settings.xml10
-rw-r--r--res/xml/settings_headers.xml9
-rw-r--r--res/xml/sound_settings.xml48
-rw-r--r--res/xml/tts_engine_settings.xml34
-rw-r--r--res/xml/tts_settings.xml67
-rw-r--r--res/xml/usb_settings.xml6
-rw-r--r--res/xml/wifi_advanced_settings.xml14
-rw-r--r--res/xml/wireless_settings.xml10
15 files changed, 122 insertions, 134 deletions
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 78a857b..4dbca6d 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -30,12 +30,12 @@
<CheckBoxPreference
android:key="toggle_large_text_preference"
android:title="@string/accessibility_toggle_large_text_title"
- android:persistent="false"/>
+ android:persistent="true"/>
<CheckBoxPreference
android:key="toggle_power_button_ends_call_preference"
android:title="@string/accessibility_power_button_ends_call_title"
- android:persistent="false">
+ android:persistent="true">
</CheckBoxPreference>
<PreferenceScreen
@@ -55,10 +55,15 @@
android:entryValues="@array/long_press_timeout_selector_values"
android:persistent="true" />
- <Preference
+ <com.android.settings.AccessibilityEnableScriptInjectionPreference
android:key="toggle_script_injection_preference"
android:title="@string/accessibility_script_injection_title"
- android:persistent="false" />
+ android:dialogTitle="@android:string/dialog_alert_title"
+ android:dialogIcon="@android:drawable/ic_dialog_alert"
+ android:dialogMessage="@string/accessibility_script_injection_security_warning"
+ android:positiveButtonText="@string/accessibility_script_injection_button_allow"
+ android:negativeButtonText="@string/accessibility_script_injection_button_disallow"
+ android:persistent="true" />
</PreferenceCategory>
diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml
index 6610a69..8d2261c 100644
--- a/res/xml/bluetooth_device_advanced.xml
+++ b/res/xml/bluetooth_device_advanced.xml
@@ -15,12 +15,8 @@
-->
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:key="title"
- android:order="10"
- android:title="@string/bluetooth_device_advanced_device_actions_title" />
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/bluetooth_device_advanced_title">
<EditTextPreference
android:key="rename_device"
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index a73e7d1..b65c2e5 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -39,6 +39,17 @@
android:entries="@array/hdcp_checking_titles"
android:entryValues="@array/hdcp_checking_values" />
+ <PreferenceScreen
+ android:key="local_backup_password"
+ android:title="@string/local_backup_password_title"
+ android:summary="@string/local_backup_password_summary_none"
+ android:persistent="false" >
+ <intent
+ android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.SetFullBackupPassword" />
+ </PreferenceScreen>
+
<PreferenceCategory android:key="debug_ui_category"
android:title="@string/debug_ui_category">
@@ -53,6 +64,11 @@
android:summary="@string/pointer_location_summary"/>
<CheckBoxPreference
+ android:key="show_touches"
+ android:title="@string/show_touches"
+ android:summary="@string/show_touches_summary"/>
+
+ <CheckBoxPreference
android:key="show_screen_updates"
android:title="@string/show_screen_updates"
android:summary="@string/show_screen_updates_summary"/>
@@ -93,6 +109,11 @@
android:entries="@array/app_process_limit_entries"
android:entryValues="@array/app_process_limit_values" />
+ <CheckBoxPreference
+ android:key="show_all_anrs"
+ android:title="@string/show_all_anrs"
+ android:summary="@string/show_all_anrs_summary"/>
+
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index c13a107..a399828 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -40,10 +40,12 @@
android:entries="@array/screen_timeout_entries"
android:entryValues="@array/screen_timeout_values" />
+ <!--
<PreferenceScreen
android:title="@string/dream_settings_title"
android:summary="@string/dream_settings_summary"
android:fragment="com.android.settings.DreamSettings" />
+ -->
<ListPreference
android:key="font_size"
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index f696187..1598939 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -83,7 +83,7 @@
android:title="@string/voice_output_category" >
<PreferenceScreen android:key="tts_settings"
- android:fragment="com.android.settings.TextToSpeechSettings"
+ android:fragment="com.android.settings.tts.TextToSpeechSettings"
android:title="@string/tts_settings_title" />
</PreferenceCategory>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 94133d0..8d8757d 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -20,14 +20,12 @@
<CheckBoxPreference
android:key="location_network"
android:title="@string/location_network_based"
- android:summaryOn="@string/location_neighborhood_level"
- android:summaryOff="@string/location_networks_disabled"/>
+ android:summary="@string/location_neighborhood_level"/>
<CheckBoxPreference
android:key="location_gps"
android:title="@string/location_gps"
- android:summaryOn="@string/location_street_level"
- android:summaryOff="@string/location_gps_disabled"/>
+ android:summary="@string/location_street_level"/>
<!-- Disabled to avoid confusion on devices with no AGPS
For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
diff --git a/res/xml/manage_accounts_settings.xml b/res/xml/manage_accounts_settings.xml
index 8ddd7e7..ebb702a 100644
--- a/res/xml/manage_accounts_settings.xml
+++ b/res/xml/manage_accounts_settings.xml
@@ -19,14 +19,8 @@
<PreferenceCategory
android:title="@string/header_general_sync_settings" />
- <CheckBoxPreference android:key="backgroundDataCheckBox"
- android:persistent="false"
- android:title="@string/background_data"
- android:summary="@string/background_data_summary"/>
-
<CheckBoxPreference android:key="syncAutomaticallyCheckBox"
android:persistent="false"
- android:dependency="backgroundDataCheckBox"
android:title="@string/sync_automatically"
android:summary="@string/sync_automatically_summary"/>
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 60efef6..57ad514 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -38,16 +38,6 @@
android:title="@string/auto_restore_title"
android:summary="@string/auto_restore_summary"
android:persistent="false" />
- <PreferenceScreen
- android:key="local_backup_password"
- android:title="@string/local_backup_password_title"
- android:summary="@string/local_backup_password_summary_none"
- android:persistent="false" >
- <intent
- android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.SetFullBackupPassword" />
- </PreferenceScreen>
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index cd6191f..0f4dbb3 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -55,8 +55,7 @@
android:title="@string/radio_controls_title"
android:breadCrumbTitle="@string/wireless_networks_settings_title"
android:fragment="com.android.settings.WirelessSettings"
- android:icon="@drawable/ic_settings_more_wireless" />
-
+ android:icon="@drawable/empty_icon" />
<!-- DEVICE -->
<header android:title="@string/header_category_device" />
@@ -66,14 +65,14 @@
android:id="@+id/sound_settings"
android:icon="@drawable/ic_settings_sound"
android:fragment="com.android.settings.SoundSettings"
- android:title="@string/sound_settings_title" />
+ android:title="@string/sound_settings" />
<!-- Display -->
<header
android:id="@+id/display_settings"
android:icon="@drawable/ic_settings_display"
android:fragment="com.android.settings.DisplaySettings"
- android:title="@string/display_settings_title" />
+ android:title="@string/display_settings" />
<!-- Storage -->
<header
@@ -140,7 +139,7 @@
<!-- Backup and reset -->
<header
android:fragment="com.android.settings.PrivacySettings"
- android:icon="@drawable/ic_settings_privacy"
+ android:icon="@drawable/ic_settings_backup"
android:title="@string/privacy_settings"
android:id="@+id/privacy_settings" />
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index ecc4af2..a13d6fc 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -19,31 +19,24 @@
android:key="sound_settings"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
- <PreferenceCategory
- android:title="@string/sound_category_sound_title"/>
-
- <CheckBoxPreference
- android:key="silent"
- android:title="@string/silent_mode_title"
- android:summary="@string/silent_mode_summary"
+ <com.android.settings.RingerVolumePreference
+ android:key="ring_volume"
+ android:title="@string/all_volume_title"
+ android:dialogTitle="@string/all_volume_title"
android:persistent="false"
- android:disableDependentsState="true" />
+ android:streamType="ring" />
<ListPreference
android:key="vibrate"
android:title="@string/vibrate_title"
- android:summary="@string/vibrate_summary"
android:entries="@array/vibrate_entries"
android:entryValues="@array/vibrate_values" />
- <com.android.settings.RingerVolumePreference
- android:key="ring_volume"
- android:dependency="silent"
- android:title="@string/all_volume_title"
- android:summary="@string/ring_volume_summary"
- android:dialogTitle="@string/all_volume_title"
+ <CheckBoxPreference
+ android:key="silent"
+ android:title="@string/silent_mode_title"
android:persistent="false"
- android:streamType="ring" />
+ />
<Preference
android:key="musicfx"
@@ -53,27 +46,20 @@
</Preference>
<PreferenceCategory
- android:key="category_calls"
- android:title="@string/sound_category_calls_title"/>
+ android:key="category_calls_and_notification"
+ android:title="@string/sound_category_calls_and_notification_title"/>
+ <!-- Do not nest these, or removals in code will break -->
<com.android.settings.DefaultRingtonePreference
android:key="ringtone"
android:title="@string/ringtone_title"
- android:summary="@string/ringtone_summary"
android:dialogTitle="@string/ringtone_title"
android:persistent="false"
android:ringtoneType="ringtone" />
- <PreferenceCategory
- android:key="category_notification"
- android:title="@string/sound_category_notification_title"/>
-
- <!-- Do not nest these, or removals in code will break -->
-
<com.android.settings.DefaultRingtonePreference
android:key="notification_sound"
android:title="@string/notification_sound_title"
- android:summary="@string/notification_sound_summary"
android:dialogTitle="@string/notification_sound_dialog_title"
android:persistent="false"
android:ringtoneType="notification" />
@@ -81,7 +67,6 @@
<CheckBoxPreference
android:key="notification_pulse"
android:title="@string/notification_pulse_title"
- android:summary="@string/notification_pulse_summary"
android:persistent="false" />
<PreferenceCategory
@@ -92,35 +77,26 @@
<CheckBoxPreference
android:key="dtmf_tone"
android:title="@string/dtmf_tone_enable_title"
- android:summaryOn="@string/dtmf_tone_enable_summary_on"
- android:summaryOff="@string/dtmf_tone_enable_summary_off"
android:defaultValue="true" />
<CheckBoxPreference
android:key="sound_effects"
android:title="@string/sound_effects_enable_title"
- android:summaryOn="@string/sound_effects_enable_summary_on"
- android:summaryOff="@string/sound_effects_enable_summary_off"
android:defaultValue="true" />
<CheckBoxPreference
android:key="lock_sounds"
android:title="@string/lock_sounds_enable_title"
- android:summaryOn="@string/lock_sounds_enable_summary_on"
- android:summaryOff="@string/lock_sounds_enable_summary_off"
android:defaultValue="true" />
<CheckBoxPreference
android:key="haptic_feedback"
android:title="@string/haptic_feedback_enable_title"
- android:summaryOn="@string/haptic_feedback_enable_summary_on"
- android:summaryOff="@string/haptic_feedback_enable_summary_off"
android:defaultValue="true" />
<ListPreference
android:key="emergency_tone"
android:title="@string/emergency_tone_title"
- android:summary="@string/emergency_tone_summary"
android:entries="@array/emergency_tone_entries"
android:entryValues="@array/emergency_tone_values" />
diff --git a/res/xml/tts_engine_settings.xml b/res/xml/tts_engine_settings.xml
new file mode 100644
index 0000000..03414e8
--- /dev/null
+++ b/res/xml/tts_engine_settings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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" android:title="">
+ <ListPreference
+ android:key="tts_default_lang"
+ android:title="@string/tts_default_lang_title"
+ android:summary="@string/tts_default_lang_summary"
+ android:persistent="false" />
+
+ <Preference
+ android:key="tts_engine_settings"
+ android:persistent="false"
+ android:title="@string/tts_engine_settings_title" />
+
+ <Preference
+ android:key="tts_install_data"
+ android:persistent="false"
+ android:title="@string/tts_install_data_title"
+ android:summary="@string/tts_install_data_summary" />
+</PreferenceScreen>
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index ecccc10..2b145d1 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -17,53 +17,24 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/tts_settings_title">
- <Preference
- android:key="tts_play_example"
+ <!-- The contents of this category are filled in by the Java code
+ based on the list of available engines. -->
+ <PreferenceCategory android:key="tts_engine_preference_section"
+ android:title="@string/tts_engine_preference_section_title" />
+
+ <PreferenceCategory android:key="tts_general_section"
+ android:title="@string/tts_general_section_title">
+ <ListPreference
+ android:key="tts_default_rate"
+ android:title="@string/tts_default_rate_title"
+ android:summary="@string/tts_default_rate_summary"
android:persistent="false"
- android:title="@string/tts_play_example_title"
- android:summary="@string/tts_play_example_summary" />
-
- <PreferenceCategory
- android:title="@string/tts_default_settings_section">
- <ListPreference
- android:key="tts_default_synth"
- android:title="@string/tts_default_synth_title"
- android:summary="@string/tts_default_synth_summary"
- android:persistent="false"
- android:entries="@array/tts_engine_entries"
- android:entryValues="@array/tts_engine_values" />
-
- <ListPreference
- android:key="tts_default_rate"
- android:title="@string/tts_default_rate_title"
- android:summary="@string/tts_default_rate_summary"
- android:persistent="false"
- android:entries="@array/tts_rate_entries"
- android:entryValues="@array/tts_rate_values" />
-
- <ListPreference
- android:key="tts_default_lang"
- android:title="@string/tts_default_lang_title"
- android:summary="@string/tts_default_lang_summary"
- android:persistent="false"
- android:entries="@array/tts_lang_entries"
- android:entryValues="@array/tts_lang_values" />
-
- </PreferenceCategory>
-
- <PreferenceCategory android:key="tts_engine_settings_section"
- android:title="@string/tts_engine_settings_section">
- <Preference
- android:key="tts_engine_settings"
- android:persistent="false"
- android:title="@string/tts_engine_settings_title" />
-
- <Preference
- android:key="tts_install_data"
- android:persistent="false"
- android:title="@string/tts_install_data_title"
- android:summary="@string/tts_install_data_summary" />
- </PreferenceCategory>
-
-
+ android:entries="@array/tts_rate_entries"
+ android:entryValues="@array/tts_rate_values" />
+ </PreferenceCategory>
+
+ <Preference android:key="tts_play_example"
+ android:persistent="false"
+ android:title="@string/tts_play_example_title"
+ android:summary="@string/tts_play_example_summary" />
</PreferenceScreen>
diff --git a/res/xml/usb_settings.xml b/res/xml/usb_settings.xml
index 28ef99b..4d6ccc9 100644
--- a/res/xml/usb_settings.xml
+++ b/res/xml/usb_settings.xml
@@ -22,12 +22,14 @@
<CheckBoxPreference
android:key="usb_mtp"
- android:title="@string/usb_label_mtp"
+ android:title="@string/usb_mtp_title"
+ android:summary="@string/usb_mtp_summary"
/>
<CheckBoxPreference
android:key="usb_ptp"
- android:title="@string/usb_label_ptp"
+ android:title="@string/usb_ptp_title"
+ android:summary="@string/usb_ptp_summary"
/>
</PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index d7344b1..c9cc884 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -24,13 +24,6 @@
android:summary="@string/wifi_notify_open_networks_summary"
android:persistent="false" />
- <!-- android:dependency="enable_wifi" -->
- <CheckBoxPreference
- android:key="wifi_enable_watchdog_service"
- android:title="@string/wifi_enable_watchdog_service"
- android:summary="@string/wifi_enable_watchdog_service_summary"
- android:persistent="false" />
-
<ListPreference
android:key="sleep_policy"
android:title="@string/wifi_setting_sleep_policy_title"
@@ -40,6 +33,13 @@
android:entryValues="@array/wifi_sleep_policy_values"
/>
+ <!-- android:dependency="enable_wifi" -->
+ <CheckBoxPreference
+ android:key="wifi_enable_watchdog_service"
+ android:title="@string/wifi_enable_watchdog_service"
+ android:summary="@string/wifi_enable_watchdog_service_summary"
+ android:persistent="false" />
+
<ListPreference
android:key="frequency_band"
android:title="@string/wifi_setting_frequency_band_title"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 1f72a93..81929d0 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -39,14 +39,14 @@
android:persistent="false" />
<PreferenceScreen
- android:fragment="com.android.settings.nfc.ZeroClick"
- android:key="zeroclick_settings"
- android:title="@string/zeroclick_settings_title"
- android:summary="@string/zeroclick_settings_summary" >
+ android:fragment="com.android.settings.nfc.NdefPush"
+ android:key="ndef_push_settings"
+ android:title="@string/ndef_push_settings_title"
+ android:summary="@string/ndef_push_settings_summary" >
</PreferenceScreen>
<PreferenceScreen
- android:fragment="com.android.settings.WifiP2pSettings"
+ android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"
android:key="wifi_p2p_settings"
android:title="@string/wifi_p2p_settings_title"
android:summary="@string/wifi_p2p_settings_summary">
generated by cgit v1.1 at 2025-08-17 11:25:38 +0000