diff options
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/accessibility_settings.xml | 3 | ||||
| -rw-r--r-- | res/xml/display_settings.xml | 5 | ||||
| -rw-r--r-- | res/xml/dream_settings.xml | 39 | ||||
| -rw-r--r-- | res/xml/wireless_settings.xml | 9 |
4 files changed, 47 insertions, 9 deletions
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 90bdfd9..88f6491 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -71,10 +71,11 @@ android:persistent="false" android:order="6"/> + <!-- We want a dialog with no title, so use an empty string to avoid a fall back to the preference title. --> <com.android.settings.AccessibilityEnableScriptInjectionPreference android:key="toggle_script_injection_preference" android:title="@string/accessibility_script_injection_title" - android:dialogTitle="@string/accessibility_script_injection_security_warning_title" + android:dialogTitle="" android:dialogIcon="@android:drawable/ic_dialog_alert" android:dialogMessage="@string/accessibility_script_injection_security_warning_summary" android:positiveButtonText="@string/accessibility_script_injection_button_allow" diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index d6ffc6c..b5f072f 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -40,6 +40,11 @@ android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> + <PreferenceScreen + android:key="screensaver" + android:title="@string/screensaver_settings_title" + android:fragment="com.android.settings.DreamSettings" /> + <ListPreference android:key="font_size" android:title="@string/title_font_size" diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml new file mode 100644 index 0000000..6569bc7 --- /dev/null +++ b/res/xml/dream_settings.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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="@string/screensaver_settings_title" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + + <com.android.settings.DreamComponentPreference + android:key="screensaver_component" + android:title="@string/screensaver_component_title" + android:persistent="false" + /> + + <com.android.settings.DreamTesterPreference + android:key="test" + android:title="@string/screensaver_test" + android:persistent="false" + /> + + <CheckBoxPreference + android:key="activate_on_dock" + android:persistent="false" + android:title="@string/screensaver_activate_on_dock_title" + android:defaultValue="true" /> + +</PreferenceScreen> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 20ffd8e..336682d 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -54,17 +54,10 @@ android:key="android_beam_settings" android:title="@string/android_beam_settings_title" /> - <CheckBoxPreference - android:key="toggle_wifi_p2p" - android:title="@string/wifi_p2p_settings_title" - android:persistent="false" /> - <PreferenceScreen 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"> - </PreferenceScreen> + android:title="@string/wifi_p2p_settings_title" /> <PreferenceScreen android:key="mobile_network_settings" |