commit 7f7adedaf995a3d3998fd2473b8d116fffce9e89
author Martijn Coenen <maco@google.com> Thu Apr 19 11:08:50 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 19 11:08:50 2012 -0700
tree efd23f4ff496842aadcd4896459dddeabc07a7a0
parent ee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3
parent b34811d8be33c9eb945cbe6745a6ad2b16fe7a31

Merge "Prevent "Beaming" from home screen."

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 2467871..35bdf14 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -485,8 +485,8 @@
                 int[] minSpanXY = mLauncher.getMinSpanForWidget(widget);
                 int minSpanX = Math.min(spanXY[0], minSpanXY[0]);
                 int minSpanY = Math.min(spanXY[1], minSpanXY[1]);
-                if (minSpanX < LauncherModel.getCellCountX() &&
-                        minSpanY < LauncherModel.getCellCountY()) {
+                if (minSpanX <= LauncherModel.getCellCountX() &&
+                        minSpanY <= LauncherModel.getCellCountY()) {
                     mWidgets.add(widget);
                 }
             } else {

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index b3b14f4..c9bebe3 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -66,7 +66,7 @@
 
     private Launcher mLauncher;
     private Handler mHandler;
-    private final Vibrator mVibrator = new Vibrator();
+    private final Vibrator mVibrator;
 
     // temporaries to avoid gc thrash
     private Rect mRectTemp = new Rect();
@@ -150,6 +150,7 @@
         mHandler = new Handler();
         mScrollZone = launcher.getResources().getDimensionPixelSize(R.dimen.scroll_zone);
         mVelocityTracker = VelocityTracker.obtain();
+        mVibrator = (Vibrator)launcher.getSystemService(Context.VIBRATOR_SERVICE);
 
         float density = launcher.getResources().getDisplayMetrics().density;
         mFlingToDeleteThresholdVelocity = (int) (FLING_TO_DELETE_THRESHOLD_Y_VELOCITY * density);

src/com/android/launcher2/PagedViewCellLayout.java

diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java
index 58b87dc..9e5452b 100644
--- a/src/com/android/launcher2/PagedViewCellLayout.java
+++ b/src/com/android/launcher2/PagedViewCellLayout.java
@@ -86,20 +86,15 @@
         return mCellHeight;
     }
 
-    @Override
-    public void setAlpha(float alpha) {
-        mChildren.setAlpha(alpha);
-    }
-
     void destroyHardwareLayers() {
         // called when a page is no longer visible (triggered by loadAssociatedPages ->
         // removeAllViewsOnPage)
-        mChildren.destroyHardwareLayer();
+        setLayerType(LAYER_TYPE_NONE, null);
     }
 
     void createHardwareLayers() {
         // called when a page is visible (triggered by loadAssociatedPages -> syncPageItems)
-        mChildren.createHardwareLayer();
+        setLayerType(LAYER_TYPE_HARDWARE, null);
     }
 
     @Override

src/com/android/launcher2/PagedViewCellLayoutChildren.java

diff --git a/src/com/android/launcher2/PagedViewCellLayoutChildren.java b/src/com/android/launcher2/PagedViewCellLayoutChildren.java
index eaef682..187a22d 100644
--- a/src/com/android/launcher2/PagedViewCellLayoutChildren.java
+++ b/src/com/android/launcher2/PagedViewCellLayoutChildren.java
@@ -141,13 +141,6 @@
         }
     }
 
-    void destroyHardwareLayer() {
-        setLayerType(LAYER_TYPE_NONE, null);
-    }
-    void createHardwareLayer() {
-        setLayerType(LAYER_TYPE_HARDWARE, null);
-    }
-
     public void enableCenteredContent(boolean enabled) {
         mCenterContent = enabled;
     }