commit 26cbf3a0016a19c20f953ccd07242bdf875da0fa
author Winson Chung <winsonc@google.com> Thu Jan 06 16:25:55 2011 -0800
committer Winson Chung <winsonc@google.com> Thu Jan 06 16:29:06 2011 -0800
tree 5aa74bc8f375880d9ccca4f176adf50734e7d533
parent 4b1c0ba3ac4a76d3ba04035e2785ced5a1faf826

Minor fixes to stop crashing on panning/dragging on phones.

Change-Id: Ibfc0072d6db039b97876702b2c0577359a7ae567

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 53a584e..4e618af 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -474,7 +474,7 @@
         // When we're small, we are either drawn normally or in the "accepts drops" state (during
         // a drag). However, we also drag the mini hover background *over* one of those two
         // backgrounds
-        if (mBackgroundAlpha > 0.0f) {
+        if (LauncherApplication.isScreenXLarge() && mBackgroundAlpha > 0.0f) {
             Drawable bg;
             boolean mini = getScaleX() < 0.5f;
 

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ee9e7a8..83f13aa 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -995,9 +995,9 @@
         final View configureButton = findViewById(R.id.configure_button);
 
         if (LauncherApplication.isScreenXLarge()) {
-            mDeleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton });
+            deleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton });
         } else {
-            deleteZone.setOverlappingView(configureButton);
+            deleteZone.setOverlappingView(findViewById(R.id.all_apps_button_cluster));
         }
         dragController.addDragListener(deleteZone);