From 3af863ba31e293e577c05537c9b8f7dc850a5e56 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 25 Jan 2011 12:16:51 -0800
Subject: [PATCH] Fixing bug where wrong homescreen outline is being shown in
 customize

Change-Id: I9da04057e5afd90d3ad3e485f5299dff870cc26a
---
 .../homescreen_large_blue_strong.9.png           | Bin 1598 -> 0 bytes
 src/com/android/launcher2/CellLayout.java        |   7 ++-----
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 res/drawable-xlarge-mdpi/homescreen_large_blue_strong.9.png

diff --git a/res/drawable-xlarge-mdpi/homescreen_large_blue_strong.9.png b/res/drawable-xlarge-mdpi/homescreen_large_blue_strong.9.png
deleted file mode 100644
index f4913e5c6891f259c02706e103c3a5b40ec9e154..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1598
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

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 9c629eef9f..086f2b83e4 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -84,7 +84,6 @@ public class CellLayout extends ViewGroup {
     private float mBackgroundAlphaMultiplier = 1.0f;
 
     private Drawable mNormalBackground;
-    private Drawable mNormalGlowBackground;
     private Drawable mActiveBackground;
     private Drawable mActiveGlowBackground;
     private Drawable mNormalBackgroundMini;
@@ -169,7 +168,6 @@ public class CellLayout extends ViewGroup {
 
         if (LauncherApplication.isScreenXLarge()) {
             mNormalBackground = res.getDrawable(R.drawable.homescreen_large_blue);
-            mNormalGlowBackground = res.getDrawable(R.drawable.homescreen_large_blue_strong);
             mActiveBackground = res.getDrawable(R.drawable.homescreen_large_green);
             mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_large_green_strong);
 
@@ -179,7 +177,6 @@ public class CellLayout extends ViewGroup {
             mActiveGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_green_strong);
 
             mNormalBackground.setFilterBitmap(true);
-            mNormalGlowBackground.setFilterBitmap(true);
             mActiveBackground.setFilterBitmap(true);
             mActiveGlowBackground.setFilterBitmap(true);
             mNormalBackgroundMini.setFilterBitmap(true);
@@ -380,8 +377,8 @@ public class CellLayout extends ViewGroup {
                 bg = mini ? mActiveBackgroundMini : mActiveGlowBackground;
             } else if (mIsDragOccuring && mAcceptsDrops) {
                 bg = mini ? mActiveBackgroundMini : mActiveBackground;
-            } else if (mIsDragOccuring && mIsDefaultDropTarget) {
-                bg = mini ? mNormalGlowBackgroundMini : mNormalGlowBackground;
+            } else if (mIsDefaultDropTarget && mini) {
+                bg = mNormalGlowBackgroundMini;
             } else {
                 bg = mini ? mNormalBackgroundMini : mNormalBackground;
             }