summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-09-26 11:17:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-26 11:17:15 -0700
commit86985837bcd99505fdc4b477fda16b7df1fb4d7b (patch)
tree82fac79de0963b1195b6d9184d38b322676e2337 /res
parentb8235acb0fdc33c50e864ec801b93b9750d7600c (diff)
parent56e419c022f0cc89bf69439f70c01f69e55b3a6f (diff)
downloadandroid_packages_screensavers_PhotoTable-86985837bcd99505fdc4b477fda16b7df1fb4d7b.tar.gz
android_packages_screensavers_PhotoTable-86985837bcd99505fdc4b477fda16b7df1fb4d7b.tar.bz2
android_packages_screensavers_PhotoTable-86985837bcd99505fdc4b477fda16b7df1fb4d7b.zip
Merge "Photo dreams declare settings activities using xml." into jb-mr1-dev
Diffstat (limited to 'res')
-rw-r--r--res/xml/photo_flipper_dream.xml3
-rw-r--r--res/xml/photo_table_dream.xml3
2 files changed, 6 insertions, 0 deletions
diff --git a/res/xml/photo_flipper_dream.xml b/res/xml/photo_flipper_dream.xml
new file mode 100644
index 0000000..a43ce9b
--- /dev/null
+++ b/res/xml/photo_flipper_dream.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dream xmlns:android="http://schemas.android.com/apk/res/android"
+ android:settingsActivity="com.android.dreams.phototable/.FlipperDreamSettings" /> \ No newline at end of file
diff --git a/res/xml/photo_table_dream.xml b/res/xml/photo_table_dream.xml
new file mode 100644
index 0000000..08d34c6
--- /dev/null
+++ b/res/xml/photo_table_dream.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dream xmlns:android="http://schemas.android.com/apk/res/android"
+ android:settingsActivity="com.android.dreams.phototable/.PhotoTableDreamSettings" /> \ No newline at end of file