PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing small folder bugs"

Browse Source
This commit is contained in:
Adam Cohen
2011-06-30 17:28:09 -07:00
committed by Android (Google) Code Review
parent fb25a8efe9 0e4857c302
commit 04dc2bc613
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Workspace.java
+7 -3
View File
@@ -1963,8 +1963,7 @@ public class Workspace extends SmoothPagedView
v.getDrawingRect(clipRect);
// For a TextView, adjust the clip rect so that we don't include the text label
if (v instanceof FolderIcon) {
} else if (v instanceof BubbleTextView) {
if (v instanceof BubbleTextView) {
final BubbleTextView tv = (BubbleTextView) v;
clipRect.bottom = tv.getExtendedPaddingTop() - (int) BubbleTextView.PADDING_V +
tv.getLayout().getLineTop(0);
@@ -1972,6 +1971,8 @@ public class Workspace extends SmoothPagedView
final TextView tv = (TextView) v;
clipRect.bottom = tv.getExtendedPaddingTop() - tv.getCompoundDrawablePadding() +
tv.getLayout().getLineTop(0);
} else if (v instanceof FolderIcon) {
clipRect.bottom = getResources().getDimensionPixelSize(R.dimen.folder_preview_size);
}
// Draw the View into the bitmap.
@@ -2101,13 +2102,16 @@ public class Workspace extends SmoothPagedView
final int screenY = (int) mTempXY[1] + (child.getHeight() - bmpHeight) / 2;
Rect dragRect = null;
if ((child instanceof BubbleTextView) && !(child instanceof FolderIcon)) {
if (child instanceof BubbleTextView) {
int iconSize = getResources().getDimensionPixelSize(R.dimen.app_icon_size);
int top = child.getPaddingTop();
int left = (bmpWidth - iconSize) / 2;
int right = left + iconSize;
int bottom = top + iconSize;
dragRect = new Rect(left, top, right, bottom);
} else if (child instanceof FolderIcon) {
int previewSize = getResources().getDimensionPixelSize(R.dimen.folder_preview_size);
dragRect = new Rect(0, 0, child.getWidth(), previewSize);
}
mLauncher.lockScreenOrientation();