summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2011-04-15 11:18:57 -0400
committerDaniel Sandler <dsandler@google.com>2011-05-26 11:32:06 -0400
commit2943cfa60670c1fc0d11d3cb4d0b67ec87e4181b (patch)
tree4cf893767abaafd15e0a03dcb5185e06ab41974e /res/xml
parentba61aaaaa37dbda976f77703b2c99571aeef6652 (diff)
downloadpackages_apps_settings-2943cfa60670c1fc0d11d3cb4d0b67ec87e4181b.zip
packages_apps_settings-2943cfa60670c1fc0d11d3cb4d0b67ec87e4181b.tar.gz
packages_apps_settings-2943cfa60670c1fc0d11d3cb4d0b67ec87e4181b.tar.bz2
Dream (screensaver) settings.
Depends on change Ied691856 for Settings.Secure.DREAM_TIMEOUT and Settings.Secure.DREAM_COMPONENT. Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/display_settings.xml9
-rw-r--r--res/xml/dream_settings.xml41
2 files changed, 49 insertions, 1 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 5e2d76e..03d9641 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -42,6 +42,13 @@
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"
+ >
+ </PreferenceScreen>
+
<ListPreference
android:key="font_size"
android:title="@string/title_font_size"
@@ -49,5 +56,5 @@
android:entries="@array/entries_font_size"
android:entryValues="@array/entryvalues_font_size"
android:dialogTitle="@string/dialog_title_font_size" />
-
+
</PreferenceScreen>
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
new file mode 100644
index 0000000..1fbb3e9
--- /dev/null
+++ b/res/xml/dream_settings.xml
@@ -0,0 +1,41 @@
+<?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/dream_settings_title"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+ <com.android.settings.DreamComponentPreference
+ android:key="dream_component"
+ android:title="@string/dream_component_title"
+ android:persistent="false"
+ />
+
+ <ListPreference
+ android:key="dream_timeout"
+ android:title="@string/dream_timeout_title"
+ android:summary="@string/dream_timeout_summary"
+ android:persistent="false"
+ android:entries="@array/dream_timeout_entries"
+ android:entryValues="@array/dream_timeout_values" />
+
+ <com.android.settings.DreamTesterPreference
+ android:key="dream_test"
+ android:title="@string/dream_test"
+ android:persistent="false"
+ />
+
+</PreferenceScreen>