diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-17 14:43:41 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-17 14:43:41 -0700 |
| commit | c268148f06f5c6c30deb1678e74530ef5aa85a67 (patch) | |
| tree | ee179b0e3dd08c1c158e9dd761b10dd75fe37e0f /src/com/android/launcher3/ButtonDropTarget.java | |
| parent | 017a5c1e6524a0b93b7fdec1de7a49aaf1d04852 (diff) | |
| parent | 9fc953b94dbc6b99e6de08c9dcc80a0cb8e3e319 (diff) | |
| download | android_packages_apps_Trebuchet-c268148f06f5c6c30deb1678e74530ef5aa85a67.tar.gz android_packages_apps_Trebuchet-c268148f06f5c6c30deb1678e74530ef5aa85a67.tar.bz2 android_packages_apps_Trebuchet-c268148f06f5c6c30deb1678e74530ef5aa85a67.zip | |
resolved conflicts for merge of 9fc953b9 to ub-launcher3-master
Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1
Diffstat (limited to 'src/com/android/launcher3/ButtonDropTarget.java')
| -rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 574f229eb..f97179c5c 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -92,7 +92,7 @@ public abstract class ButtonDropTarget extends TextView // drawableLeft and drawableStart. mDrawable = getResources().getDrawable(resId); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + if (Utilities.ATLEAST_JB_MR1) { setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null); } else { setCompoundDrawablesWithIntrinsicBounds(mDrawable, null, null, null); @@ -113,7 +113,7 @@ public abstract class ButtonDropTarget extends TextView @Override public final void onDragEnter(DragObject d) { d.dragView.setColor(mHoverColor); - if (Utilities.isLmpOrAbove()) { + if (Utilities.ATLEAST_LOLLIPOP) { animateTextColor(mHoverColor); } else { if (mCurrentFilter == null) { @@ -130,8 +130,8 @@ public abstract class ButtonDropTarget extends TextView // Do nothing } - protected void resetHoverColor() { - if (Utilities.isLmpOrAbove()) { + protected void resetHoverColor() { + if (Utilities.ATLEAST_LOLLIPOP) { animateTextColor(mOriginalTextColor.getDefaultColor()); } else { mDrawable.setColorFilter(null); |