commit 7906af3dfcf2ff103d331f28c8b250e62fbfcf5a
author The Android Automerger <android-build@android.com> Wed Oct 27 07:15:57 2010 -0700
committer The Android Automerger <android-build@android.com> Wed Oct 27 07:15:57 2010 -0700
tree 89011ab02b5484598c6de0a86ecd01a03962864f
parent 6a69a6855e147f28be2e6adb01cd56d7821726d6
parent a915a917a2d80a076030cf90791d607cf67a250c

Merge branch 'master' into honeycomb-release

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 9bb10fa..63da108 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -847,7 +847,9 @@
             final View view = getChildAt(i);
             view.setDrawingCacheEnabled(enabled);
             // Update the drawing caches
-            view.buildDrawingCache(true);
+            if (!view.isHardwareAccelerated()) {
+                view.buildDrawingCache(true);
+            }
         }
     }
 

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 4ccc4ae..9739b15 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -53,7 +53,9 @@
     protected static final int INVALID_PAGE = -1;
 
     // the min drag distance for a fling to register, to prevent random page shifts
-    private static final int MIN_LENGTH_FOR_FLING = 50;
+    private static final int MIN_LENGTH_FOR_FLING = 25;
+    // The min drag distance to trigger a page shift (regardless of velocity)
+    private static final int MIN_LENGTH_FOR_MOVE = 200;
 
     private static final int PAGE_SNAP_ANIMATION_DURATION = 1000;
     protected static final float NANOTIME_DIV = 1000000000.0f;
@@ -836,12 +838,17 @@
                 final VelocityTracker velocityTracker = mVelocityTracker;
                 velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
                 int velocityX = (int) velocityTracker.getXVelocity(activePointerId);
-                boolean isfling = Math.abs(mDownMotionX - x) > MIN_LENGTH_FOR_FLING;
+                final int deltaX = (int) (x - mDownMotionX);
+                boolean isfling = Math.abs(deltaX) > MIN_LENGTH_FOR_FLING;
+                boolean isSignificantMove = Math.abs(deltaX) > MIN_LENGTH_FOR_MOVE;
 
                 final int snapVelocity = mSnapVelocity;
-                if (isfling && velocityX > snapVelocity && mCurrentPage > 0) {
+                if ((isSignificantMove && deltaX > 0 ||
+                        (isfling && velocityX > snapVelocity)) &&
+                        mCurrentPage > 0) {
                     snapToPageWithVelocity(mCurrentPage - 1, velocityX);
-                } else if (isfling && velocityX < -snapVelocity &&
+                } else if ((isSignificantMove && deltaX < 0 ||
+                        (isfling && velocityX < -snapVelocity)) &&
                         mCurrentPage < getChildCount() - 1) {
                     snapToPageWithVelocity(mCurrentPage + 1, velocityX);
                 } else {

src/com/android/launcher2/PagedViewCellLayout.java

diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java
index 0a5a2ec..b779a97 100644
--- a/src/com/android/launcher2/PagedViewCellLayout.java
+++ b/src/com/android/launcher2/PagedViewCellLayout.java
@@ -250,7 +250,9 @@
             final View view = getChildAt(i);
             view.setDrawingCacheEnabled(enabled);
             // Update the drawing caches
-            view.buildDrawingCache(true);
+            if (!view.isHardwareAccelerated()) {
+                view.buildDrawingCache(true);
+            }
         }
     }