diff options
author | Chris Wren <cwren@android.com> | 2013-04-11 16:02:21 -0400 |
---|---|---|
committer | Chris Wren <cwren@android.com> | 2013-04-11 17:26:40 -0400 |
commit | f362b8f1d503df040c55ac04913dabdbb2cd7155 (patch) | |
tree | 0f8a52e4e09ca2c6f6ce46713615e0b3091df21e /res | |
parent | 3910ecc7c3a93485d32f8c1eac79e47dbf3753fb (diff) | |
download | android_packages_screensavers_PhotoTable-f362b8f1d503df040c55ac04913dabdbb2cd7155.tar.gz android_packages_screensavers_PhotoTable-f362b8f1d503df040c55ac04913dabdbb2cd7155.tar.bz2 android_packages_screensavers_PhotoTable-f362b8f1d503df040c55ac04913dabdbb2cd7155.zip |
graphics optimization to get back inside 60Hz.
Bug: 8594598
Change-Id: Iccb1779b5dd133af4441038c3f945d1c1ac1ba8d
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-sw800dp/table.xml | 17 | ||||
-rw-r--r-- | res/layout/table.xml | 27 | ||||
-rw-r--r-- | res/values-land-notouch/config.xml | 10 | ||||
-rw-r--r-- | res/values-sw800dp/config.xml | 5 | ||||
-rw-r--r-- | res/values/config.xml | 4 |
5 files changed, 50 insertions, 13 deletions
diff --git a/res/layout-sw800dp/table.xml b/res/layout-sw800dp/table.xml index 0b67524..e063cd5 100644 --- a/res/layout-sw800dp/table.xml +++ b/res/layout-sw800dp/table.xml @@ -21,7 +21,22 @@ android:background="@+drawable/table" android:id="@+id/table" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" > + + <FrameLayout + android:id="@+id/stageleft" + android:layout_width="match_parent" + android:layout_height="match_parent" + /> + + <FrameLayout + android:id="@+id/background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layerType="hardware" + /> + + </com.android.dreams.phototable.PhotoTable> <!-- View android:background="@+drawable/vignette_br" android:layout_gravity="bottom|right" diff --git a/res/layout/table.xml b/res/layout/table.xml index b1575b7..7cdb51a 100644 --- a/res/layout/table.xml +++ b/res/layout/table.xml @@ -18,13 +18,28 @@ android:layout_width="match_parent" android:layout_height="match_parent" > + <com.android.dreams.phototable.PhotoTable - android:background="@+drawable/table" - android:id="@+id/table" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true" - /> + android:id="@+id/table" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@+drawable/table" + android:focusable="true" > + + <FrameLayout + android:id="@+id/stageleft" + android:layout_width="match_parent" + android:layout_height="match_parent" + /> + + <FrameLayout + android:id="@+id/background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layerType="hardware" + /> + + </com.android.dreams.phototable.PhotoTable> <!-- View android:background="@+drawable/vignette_br" android:layout_gravity="bottom|right" diff --git a/res/values-land-notouch/config.xml b/res/values-land-notouch/config.xml index c9d537f..d125dd1 100644 --- a/res/values-land-notouch/config.xml +++ b/res/values-land-notouch/config.xml @@ -16,9 +16,15 @@ <resources> <!-- Maximum number of photos to leave on the table. --> - <integer name="table_capacity">8</integer> + <integer name="table_capacity">6</integer> <!-- Number of images to discard at a time. --> - <integer name="redeal_count">4</integer> + <integer name="redeal_count">2</integer> + + <!-- Parts per million ratio between image size on the table and screen size. --> + <integer name="table_ratio">333333</integer> + + <!-- Duration in milliseconds for the pickup animation. --> + <integer name="photo_pickup_duration">1500</integer> </resources>
\ No newline at end of file diff --git a/res/values-sw800dp/config.xml b/res/values-sw800dp/config.xml index 699e15a..ec6a85f 100644 --- a/res/values-sw800dp/config.xml +++ b/res/values-sw800dp/config.xml @@ -20,7 +20,8 @@ <!-- Milliseconds to wait before the next fast drop.--> <integer name="fast_drop">5000</integer> - <!-- Parts per million ratio between image size and screen size. --> - <integer name="image_ratio">500000</integer> + <!-- Duration in milliseconds for the pickup animation. --> + <integer name="photo_pickup_duration">1500</integer> + </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 84299b1..c3a6e65 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -100,8 +100,8 @@ <!-- Enable story mode. --> <bool name="enable_story_mode">true</bool> - <!-- Duration ion milliseconds for the pickup animation. --> - <integer name="photo_pickup_duration">2000</integer> + <!-- Duration in milliseconds for the pickup animation. --> + <integer name="photo_pickup_duration">1000</integer> <!-- Milliseconds that the selection will remain without user interaction. --> <integer name="max_selection_time">30000</integer> |