quick fix for jank on touch devices.

optimizations for notouch devices caused jank
on touch.  The best solution is difficult, so
for the time being, let's just disable that
optimiztion on touch devices.

Bug: 9462757
Change-Id: I4e574eb23d0764267e5b5efea01230feba5114d1

5 files changed, 31 insertions, 1 deletions

diff --git a/res/layout-sw800dp/table.xml b/res/layout-sw800dp/table.xml
index e063cd5..c40ee48 100644
--- a/res/layout-sw800dp/table.xml
+++ b/res/layout-sw800dp/table.xml
@@ -23,6 +23,15 @@
      android:layout_width="match_parent"
      android:layout_height="match_parent" >
 
+      <View
+          android:id="@+id/scrim"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:background="@+drawable/table"
+          android:alpha="0"
+          android:visibility="gone"
+          />
+
      <FrameLayout
          android:id="@+id/stageleft"
          android:layout_width="match_parent"
diff --git a/res/layout/table.xml b/res/layout/table.xml
index 7cdb51a..10622f5 100644
--- a/res/layout/table.xml
+++ b/res/layout/table.xml
@@ -26,6 +26,15 @@
       android:background="@+drawable/table"
       android:focusable="true" >
 
+     <View
+         android:id="@+id/scrim"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:background="@+drawable/table"
+         android:alpha="0"
+         android:visibility="gone"
+         />
+
      <FrameLayout
          android:id="@+id/stageleft"
          android:layout_width="match_parent"
diff --git a/res/values-land-notouch/config.xml b/res/values-land-notouch/config.xml
index d125dd1..5e088e4 100644
--- a/res/values-land-notouch/config.xml
+++ b/res/values-land-notouch/config.xml
@@ -27,4 +27,6 @@
     <!-- Duration in milliseconds for the pickup animation. -->
     <integer name="photo_pickup_duration">1500</integer>
 
+    <!-- Enable hardware layer optimization (interferes with dragging). -->
+    <bool name="enable_background_optimization">true</bool>
 </resources>
\ No newline at end of file
diff --git a/res/values-sw800dp/config.xml b/res/values-sw800dp/config.xml
index ec6a85f..8af15bc 100644
--- a/res/values-sw800dp/config.xml
+++ b/res/values-sw800dp/config.xml
@@ -14,13 +14,20 @@
      limitations under the License.
 -->
 <resources>
+
+  <!-- Maximum number of photos to leave on the table.-->
+  <integer name="table_capacity">8</integer>
+
   <!-- Milliseconds between drops. -->
   <integer name="table_drop_period">75000</integer>
 
   <!-- Milliseconds to wait before the next fast drop.-->
   <integer name="fast_drop">5000</integer>
 
-  <!-- Duration in milliseconds for the pickup animation. -->
+  <!-- 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 c3a6e65..9087266 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -109,5 +109,8 @@
   <!-- Milliseconds that the focus will remain without user interaction. -->
   <integer name="max_focus_time">5000</integer>
 
+  <!-- Enable hardware layer optimization (interferes with dragging). -->
+  <bool name="enable_background_optimization">false</bool>
+
 </resources>