summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2012-10-11 00:35:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-11 00:35:59 -0700
commit9163ae4a006ee336751ed1362d9877544e467015 (patch)
tree26c5d65b9ebc3f607c24828dde62a0a9324ec124
parent14a31aff1d6b53191a74641f11ff037ef95758c6 (diff)
parentcf64ff0558ae8efb0a8a34df1045159d07b7bfc7 (diff)
downloadandroid_packages_screensavers_PhotoTable-9163ae4a006ee336751ed1362d9877544e467015.tar.gz
android_packages_screensavers_PhotoTable-9163ae4a006ee336751ed1362d9877544e467015.tar.bz2
android_packages_screensavers_PhotoTable-9163ae4a006ee336751ed1362d9877544e467015.zip
Merge "tweak photo dreams to be a little more relaxing." into jb-mr1-dev
-rw-r--r--res/values-sw800dp/config.xml5
-rw-r--r--res/values/config.xml4
2 files changed, 6 insertions, 3 deletions
diff --git a/res/values-sw800dp/config.xml b/res/values-sw800dp/config.xml
index adfccc1..eeefc3a 100644
--- a/res/values-sw800dp/config.xml
+++ b/res/values-sw800dp/config.xml
@@ -14,8 +14,11 @@
limitations under the License.
-->
<resources>
+ <!-- Milliseconds between drops. -->
+ <integer name="table_drop_period">90000</integer>
+
<!-- Milliseconds to wait before the next fast drop.-->
- <integer name="fast_drop">4000</integer>
+ <integer name="fast_drop">10000</integer>
<!-- Parts per million ratio between image size and screen size. -->
<integer name="image_ratio">500000</integer>
diff --git a/res/values/config.xml b/res/values/config.xml
index b4de65c..e5dd458 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -15,10 +15,10 @@
-->
<resources>
<!-- Milliseconds between drops. -->
- <integer name="table_drop_period">30000</integer>
+ <integer name="table_drop_period">45000</integer>
<!-- Milliseconds to wait before the next fast drop.-->
- <integer name="fast_drop">2000</integer>
+ <integer name="fast_drop">4000</integer>
<!-- Milliseconds between drops. -->
<integer name="carousel_drop_period">10000</integer>