diff options
author | Winson Chung <winsonc@google.com> | 2013-12-12 00:35:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-12 00:35:47 +0000 |
commit | b6147f85786c78b3608eabf2286cd9e61c28878d (patch) | |
tree | 7042bdad7c4b9d09b7b2b89afd9ea958b101e547 /src/com/android/launcher3/CellLayout.java | |
parent | 1239b9da8901f1384aa30f88f8b660078d37ea82 (diff) | |
parent | 59a488ac03aa122b75e9a358db74acf7bb4d2508 (diff) | |
download | android_packages_apps_Trebuchet-b6147f85786c78b3608eabf2286cd9e61c28878d.tar.gz android_packages_apps_Trebuchet-b6147f85786c78b3608eabf2286cd9e61c28878d.tar.bz2 android_packages_apps_Trebuchet-b6147f85786c78b3608eabf2286cd9e61c28878d.zip |
Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 75f6a196c..05e31af02 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -100,6 +100,7 @@ public class CellLayout extends ViewGroup { private int mForegroundAlpha = 0; private float mBackgroundAlpha; private float mBackgroundAlphaMultiplier = 1.0f; + private boolean mDrawBackground = true; private Drawable mNormalBackground; private Drawable mActiveGlowBackground; @@ -388,6 +389,10 @@ public class CellLayout extends ViewGroup { mUseActiveGlowBackground = use; } + void disableBackground() { + mDrawBackground = false; + } + boolean getIsDragOverlapping() { return mIsDragOverlapping; } @@ -416,7 +421,7 @@ public class CellLayout extends ViewGroup { // 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 (mDrawBackground && mBackgroundAlpha > 0.0f) { Drawable bg; if (mUseActiveGlowBackground) { |