diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-01-25 12:16:51 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-01-25 13:16:37 -0800 |
| commit | 3af863ba31e293e577c05537c9b8f7dc850a5e56 (patch) | |
| tree | f95aa92e5b4800ed0da6c8cfbc3ce7afb2ce2876 /src/com/android | |
| parent | 8c920dd3683d752aa4c43e964831ce53f9b72887 (diff) | |
| download | packages_apps_trebuchet-3af863ba31e293e577c05537c9b8f7dc850a5e56.zip packages_apps_trebuchet-3af863ba31e293e577c05537c9b8f7dc850a5e56.tar.gz packages_apps_trebuchet-3af863ba31e293e577c05537c9b8f7dc850a5e56.tar.bz2 | |
Fixing bug where wrong homescreen outline is being shown in customize
Change-Id: I9da04057e5afd90d3ad3e485f5299dff870cc26a
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 9c629ee..086f2b8 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; } |