aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various lint error fixes.

Browse Source 
> Fixing some RTL errors by specifying both marginStart and marginLeft
> Moving all layout direction checks to Utilities
> Explicitely adding @TargetApi before every method

Change-Id: Ibe9c52b93b5a6adeadb27ace2b312770fd732ea0
This commit is contained in:
Sunny Goyal
2015-05-14 00:07:08 -07:00
parent 5a92b2356f
commit 7066003b20
43 changed files with 181 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/launcher3/ButtonDropTarget.java
View File

@@ -83,6 +83,7 @@ public abstract class ButtonDropTarget extends TextView
}
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
protected void setDrawable(int resId) {
// Get the hover color
mDrawable = (TransitionDrawable) getCurrentDrawable();
@@ -90,7 +91,11 @@ public abstract class ButtonDropTarget extends TextView
if (mDrawable == null) {
// TODO: investigate why this is ever happening. Presently only on one known device.
mDrawable = (TransitionDrawable) getResources().getDrawable(resId);
setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null);
} else {
setCompoundDrawablesWithIntrinsicBounds(mDrawable, null, null, null);
}
}
if (null != mDrawable) {
@@ -107,7 +112,7 @@ public abstract class ButtonDropTarget extends TextView
}
protected Drawable getCurrentDrawable() {
Drawable[] drawables = getCompoundDrawablesRelative();
Drawable[] drawables = getCompoundDrawables();
for (int i = 0; i < drawables.length; ++i) {
if (drawables[i] != null) {
return drawables[i];
@@ -241,10 +246,6 @@ public abstract class ButtonDropTarget extends TextView
outRect.offsetTo(coords[0], coords[1]);
}
private boolean isRtl() {
return (getLayoutDirection() == LAYOUT_DIRECTION_RTL);
}
protected Rect getIconRect(int viewWidth, int viewHeight, int drawableWidth, int drawableHeight) {
DragLayer dragLayer = mLauncher.getDragLayer();
@@ -258,7 +259,7 @@ public abstract class ButtonDropTarget extends TextView
final int left;
final int right;
if (isRtl()) {
if (Utilities.isRtl(getResources())) {
right = to.right - getPaddingRight();
left = right - width;
} else {