summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-06-16 16:55:28 -0700
committerAmith Yamasani <yamasani@google.com>2011-06-16 17:48:40 -0700
commitfcbf7cffb6e16b202006d306bafaace97508332b (patch)
tree4b1bc5a5a4d95f657afe173e799897d23dd6cefe /res/xml
parent0ae7893ab9fe205a0d69a8dce6cc4b87b9eb0ba2 (diff)
downloadpackages_apps_settings-fcbf7cffb6e16b202006d306bafaace97508332b.zip
packages_apps_settings-fcbf7cffb6e16b202006d306bafaace97508332b.tar.gz
packages_apps_settings-fcbf7cffb6e16b202006d306bafaace97508332b.tar.bz2
Wallpaper settings
Added an option in Screen settings to choose a wallpaper. It then shows a list of wallpaper sources and launches the corresponding intent on selecting. Bug: 4691375 Change-Id: I9de9edf56ae4cdd5145a1c5d836df66b893a05fe
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/display_settings.xml8
-rw-r--r--res/xml/wallpaper_settings.xml20
2 files changed, 27 insertions, 1 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 03d9641..b0abd9a 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -41,7 +41,13 @@
android:persistent="false"
android:entries="@array/screen_timeout_entries"
android:entryValues="@array/screen_timeout_values" />
-
+
+ <PreferenceScreen
+ android:key="wallpaper"
+ android:title="@string/wallpaper_settings_title"
+ android:fragment="com.android.settings.WallpaperTypeSettings"
+ />
+
<PreferenceScreen
android:title="@string/dream_settings_title"
android:summary="@string/dream_settings_summary"
diff --git a/res/xml/wallpaper_settings.xml b/res/xml/wallpaper_settings.xml
new file mode 100644
index 0000000..63346f7
--- /dev/null
+++ b/res/xml/wallpaper_settings.xml
@@ -0,0 +1,20 @@
+<?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="@string/wallpaper_settings_title">
+
+</PreferenceScreen>