mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 18:58:19 +00:00
Version code cleanup
> Renaming Lmp to Lollipop > Lollipop_MR1 instead of directly using 22 > Using M APIs directly instead of reflection Change-Id: I10a307f46e3be15b3299f549a2fd7e0e215a6a1b
This commit is contained in:
@@ -24,7 +24,6 @@ import android.animation.ValueAnimator.AnimatorUpdateListener;
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
||||
import android.content.res.ColorStateList;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.ColorMatrix;
|
||||
import android.graphics.ColorMatrixColorFilter;
|
||||
import android.graphics.PointF;
|
||||
@@ -93,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);
|
||||
@@ -114,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) {
|
||||
@@ -131,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);
|
||||
|
||||
Reference in New Issue
Block a user