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

Fix Launcher drop targets for App remove / uninstall / info

Browse Source 
- make the code aware of the layout direction
- use start drawables
- fix animation drop rect

Change-Id: I35f01b9079aef418c0a22b39e32344c7bf5a0660
This commit is contained in:
Fabrice Di Meglio
2013-02-06 15:40:46 -08:00
parent 892d023c54
commit d6a33c6f34
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/launcher2/ButtonDropTarget.java
View File

@@ -22,6 +22,7 @@ import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
import com.android.launcher.R;
@@ -70,7 +71,7 @@ public class ButtonDropTarget extends TextView implements DropTarget, DragContro
}
protected Drawable getCurrentDrawable() {
Drawable[] drawables = getCompoundDrawables();
Drawable[] drawables = getCompoundDrawablesRelative();
for (int i = 0; i < drawables.length; ++i) {
if (drawables[i] != null) {
return drawables[i];
@@ -116,21 +117,39 @@ public class ButtonDropTarget extends TextView implements DropTarget, DragContro
outRect.bottom += mBottomDragPadding;
}
Rect getIconRect(int itemWidth, int itemHeight, int drawableWidth, int drawableHeight) {
private boolean isRtl() {
return (getLayoutDirection() == View.LAYOUT_DIRECTION_RTL);
}
Rect getIconRect(int viewWidth, int viewHeight, int drawableWidth, int drawableHeight) {
DragLayer dragLayer = mLauncher.getDragLayer();
// Find the rect to animate to (the view is center aligned)
Rect to = new Rect();
dragLayer.getViewRectRelativeToSelf(this, to);
int width = drawableWidth;
int height = drawableHeight;
int left = to.left + getPaddingLeft();
int top = to.top + (getMeasuredHeight() - height) / 2;
to.set(left, top, left + width, top + height);
final int width = drawableWidth;
final int height = drawableHeight;
final int left;
final int right;
if (isRtl()) {
right = to.right - getPaddingRight();
left = right - width;
} else {
left = to.left + getPaddingLeft();
right = left + width;
}
final int top = to.top + (getMeasuredHeight() - height) / 2;
final int bottom = top + height;
to.set(left, top, right, bottom);
// Center the destination rect about the trash icon
int xOffset = (int) -(itemWidth - width) / 2;
int yOffset = (int) -(itemHeight - height) / 2;
final int xOffset = (int) -(viewWidth - width) / 2;
final int yOffset = (int) -(viewHeight - height) / 2;
to.offset(xOffset, yOffset);
return to;