summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2012-08-29 15:57:23 -0400
committerChris Wren <cwren@android.com>2012-08-30 07:59:53 -0400
commit23f9b01ba3f51a33a2ba92bca7d7a53f25b1b146 (patch)
treec5f5fbc1a21c8d54e7de161eaa6318364e5b80ae /res
parent20e2554251954f6757462ab13470c1ebdcfba62e (diff)
downloadandroid_packages_screensavers_PhotoTable-23f9b01ba3f51a33a2ba92bca7d7a53f25b1b146.tar.gz
android_packages_screensavers_PhotoTable-23f9b01ba3f51a33a2ba92bca7d7a53f25b1b146.tar.bz2
android_packages_screensavers_PhotoTable-23f9b01ba3f51a33a2ba92bca7d7a53f25b1b146.zip
PhotoTable Polish:
+ remove manual rotation + better icon + gradient background + remove tap to dismiss + (temporarily disabled) flick to replace Change-Id: I2177077e37ce07a131a67bfbd11f8a447775ab98
Diffstat (limited to 'res')
-rw-r--r--res/drawable/table.xml30
-rw-r--r--res/layout/photo.xml2
-rw-r--r--res/mipmap-hdpi/icon.pngbin4713 -> 11919 bytes
-rw-r--r--res/mipmap-mdpi/icon.pngbin2850 -> 7861 bytes
-rw-r--r--res/mipmap-xhdpi/icon.pngbin0 -> 17695 bytes
-rw-r--r--res/values-sw800dp/config.xml3
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/config.xml18
-rw-r--r--res/values/dimen.xml1
9 files changed, 55 insertions, 2 deletions
diff --git a/res/drawable/table.xml b/res/drawable/table.xml
new file mode 100644
index 0000000..4663f51
--- /dev/null
+++ b/res/drawable/table.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <gradient
+ android:angle="90"
+ android:startColor="@color/tabletop_light"
+ android:endColor="@color/tabletop_dark"
+ android:type="linear"
+ />
+ <padding
+ android:left="10dp"
+ android:top="10dp"
+ android:right="10dp"
+ android:bottom="10dp" />
+</shape>
diff --git a/res/layout/photo.xml b/res/layout/photo.xml
index 988dbe4..1850c21 100644
--- a/res/layout/photo.xml
+++ b/res/layout/photo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
diff --git a/res/mipmap-hdpi/icon.png b/res/mipmap-hdpi/icon.png
index b57ffa4..869cf89 100644
--- a/res/mipmap-hdpi/icon.png
+++ b/res/mipmap-hdpi/icon.png
Binary files differ
diff --git a/res/mipmap-mdpi/icon.png b/res/mipmap-mdpi/icon.png
index 5cd2f30..682ab14 100644
--- a/res/mipmap-mdpi/icon.png
+++ b/res/mipmap-mdpi/icon.png
Binary files differ
diff --git a/res/mipmap-xhdpi/icon.png b/res/mipmap-xhdpi/icon.png
new file mode 100644
index 0000000..dc36096
--- /dev/null
+++ b/res/mipmap-xhdpi/icon.png
Binary files differ
diff --git a/res/values-sw800dp/config.xml b/res/values-sw800dp/config.xml
index 7771f21..eff4c2b 100644
--- a/res/values-sw800dp/config.xml
+++ b/res/values-sw800dp/config.xml
@@ -14,6 +14,9 @@
limitations under the License.
-->
<resources>
+ <!-- Number of photos to drop when the screensaver starts.-->
+ <integer name="initial_drop">5</integer>
+
<!-- Parts per million ratio between image size and screen size. -->
<integer name="image_ratio">500000</integer>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9d5864e..279c0c9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,5 +14,6 @@
limitations under the License.
-->
<resources>
- <color name="tabletop">#ff444444</color>
+ <color name="tabletop_dark">#ff222222</color>
+ <color name="tabletop_light">#ff111111</color>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index f1c9fcc..c510c2e 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -27,7 +27,25 @@
<!-- Parts per million ratio between image size and screen size. -->
<integer name="image_ratio">1000000</integer>
+ <!-- Parts per million ratio between image size on the table and screen size. -->
+ <integer name="table_ratio">500000</integer>
+
+ <!-- The maximum allowed rotation of images thrown onto the table. -->
+ <integer name="max_image_rotation">30</integer>
+
<!-- Maximum number of image paths to load before shuffling. -->
<integer name="image_queue_size">1000</integer>
+
+ <!-- Enable manual rotation of images. -->
+ <bool name="enable_manual_image_rotation">false</bool>
+
+ <!-- Enable flinging away photos. -->
+ <bool name="enable_fling">false</bool>
+
+ <!-- Honor tap on table to exit. -->
+ <bool name="enable_tap_to_exit">false</bool>
+
+ <!-- Parts per million damping coefficient of the table. -->
+ <integer name="table_damping">500000</integer>
</resources>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 7e070df..eaf42ef 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -14,5 +14,6 @@
limitations under the License.
-->
<resources>
+ <!-- Amount photo is inset to account for the frame. -->
<dimen name="photo_inset">4px</dimen>
</resources>